0c4553d28a
When RecursiveMerger tried to determine a common base tree it was recursively tried to merge multiple common bases. But these intermediate merges which have just been done to determine a single common base for the final merge already filled some important fields (toBeCheckedOut, toBeDeleted, ...). These side effects of the intermediate merges led to wrong results of the final merge. One symptom was that after a recursive merge which should be succesful you could still see leftover files in the worktree: files which existed in the (virtual) common base but which don't exist anymore in the branches to be merged. The solution is easy: Clear the appropriate fields after common base determination and start the final merge with a clean state. Change-Id: I644ea9e1cb15360f7901bc0483cdb9286308c226 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> |
||
|---|---|---|
| .. | ||
| .settings | ||
| META-INF | ||
| src/org/eclipse/jgit/junit | ||
| .classpath | ||
| .gitignore | ||
| .project | ||
| build.properties | ||
| plugin.properties | ||
| pom.xml | ||