mirrors/jgit - jgit - source @ dussan.org

Vēsture

Robin Stocker 7dc8a4f089 Fix exception on conflicts with recursive merge When there are conflicts with a recursive merge, the conflicting paths are stored in unmergedPaths (field in ResolveMerger). Later, when the MergeResult is constructed in MergeCommand, getBaseCommit is called, which computes the merge base a second time. In case of RecursiveMerger, getBaseCommit merges the multiple merge bases into one. It does this not by creating a new ResolveMerger but instead calling mergeTrees. The problem with mergeTrees is that at the end, it checks if unmergedPaths is non-empty and returns false in that case. Because unmergedPaths was already non-empty because of the real merge, it thinks that there were conflicts when computing the merge base again, when there really were none. This can be fixed by storing the base commit when computing it and then returning that instead of computing it a second time. Note that another possible fix would be to just use a new ResolveMerger for merging the merge bases instead. This would also remove the need to remember the old value of dircache, inCore and workingTreeIterator (see RecursiveMerger#getBaseCommit). Bug: 419641 Change-Id: Ib2ebf4e177498c22a9098aa225e3cfcf16bbd958 Signed-off-by: Robin Stocker <robin@nibor.org>		pirms 10 gadiem
..
.settings	Disable warning about assigning to parameter	pirms 11 gadiem
META-INF	Add uses directives to ensure OSGi wires jgit bundles correctly	pirms 10 gadiem
findBugs	[findBugs] Silence warning about Transport initialization	pirms 11 gadiem
resources/org/eclipse/jgit/internal	Add Squash/Fixup support for rebase interactive in RebaseCommand	pirms 10 gadiem
src/org/eclipse/jgit	Fix exception on conflicts with recursive merge	pirms 10 gadiem
.classpath	Externalize strings from JGit	pirms 14 gadiem
.fbprefs	Initial JGit contribution to eclipse.org	pirms 14 gadiem
.gitignore	Finish removing Apache Felix maven-bundle-plugin	pirms 14 gadiem
.project	Revert "Hide Maven target directories from Eclipse"	pirms 14 gadiem
about.html	Add missing about.html files to all shipped bundles	pirms 13 gadiem
build.properties	Add "resources/" as a source folder	pirms 14 gadiem
plugin.properties	Remove incubation marker	pirms 13 gadiem
pom.xml	Prepare 3.2.0-SNAPSHOT builds	pirms 10 gadiem