mirrors/jgit - jgit - source @ dussan.org

History

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>		10 years ago
..
MergeAlgorithm.java	Optimize MergeAlgorithm if ours or theirs is empty	13 years ago
MergeChunk.java	Fix Javadoc warnings	14 years ago
MergeFormatter.java	Mark non-externalizable strings as such	11 years ago
MergeMessageFormatter.java	Add conflicts message before footer	11 years ago
MergeResult.java	Refactor diff sequence API	13 years ago
MergeStrategy.java	Add missing @since tags	11 years ago
Merger.java	Fix exception on conflicts with recursive merge	10 years ago
RecursiveMerger.java	Remove unused logger from RecursiveMerger	11 years ago
ResolveMerger.java	A deleted work tree file is not a conflict when merge wants to delete it	11 years ago
SquashMessageFormatter.java	Mark non-externalizable strings as such	11 years ago
StrategyOneSided.java	Fix exception on conflicts with recursive merge	10 years ago
StrategyRecursive.java	Fix @since tags in JGit, version 2.4 never existed	11 years ago
StrategyResolve.java	Mark non-externalizable strings as such	11 years ago
StrategySimpleTwoWayInCore.java	Mark non-externalizable strings as such	11 years ago
ThreeWayMergeStrategy.java	Extend merge support for bare repositories	13 years ago
ThreeWayMerger.java	Fix exception on conflicts with recursive merge	10 years ago
package-info.java	Add Javadoc description for packages	11 years ago