During recursive merge jgit potentially has to merge multiple common ancestors. If this fails because there are conflicts then the exception thrown for that should have a message which states this clearly. Previously a wrong message was given ("More than 200 merge bases ...") Change-Id: Ia3c058d5575decdefd50390ed83b63668d31c1d1tags/v3.5.0.201409071800-rc1
@@ -311,6 +311,7 @@ mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs | |||
mergeStrategyAlreadyExistsAsDefault=Merge strategy "{0}" already exists as a default strategy | |||
mergeStrategyDoesNotSupportHeads=merge strategy {0} does not support {1} heads to be merged into HEAD | |||
mergeUsingStrategyResultedInDescription=Merge of revisions {0} with base {1} using strategy {2} resulted in: {3}. {4} | |||
mergeRecursiveConflictsWhenMergingCommonAncestors=Multiple common ancestors were found and merging them resulted in a conflict: {0}, {1} | |||
mergeRecursiveReturnedNoCommit=Merge returned no commit:\n Depth {0}\n Head one {1}\n Head two {2} | |||
mergeRecursiveTooManyMergeBasesFor = "More than {0} merge bases for:\n a {1}\n b {2} found:\n count {3}" | |||
messageAndTaggerNotAllowedInUnannotatedTags = Unannotated tags cannot have a message or tagger |
@@ -370,6 +370,7 @@ public class JGitText extends TranslationBundle { | |||
/***/ public String mergeStrategyAlreadyExistsAsDefault; | |||
/***/ public String mergeStrategyDoesNotSupportHeads; | |||
/***/ public String mergeUsingStrategyResultedInDescription; | |||
/***/ public String mergeRecursiveConflictsWhenMergingCommonAncestors; | |||
/***/ public String mergeRecursiveReturnedNoCommit; | |||
/***/ public String mergeRecursiveTooManyMergeBasesFor; | |||
/***/ public String messageAndTaggerNotAllowedInUnannotatedTags; |
@@ -203,10 +203,8 @@ public class RecursiveMerger extends ResolveMerger { | |||
throw new NoMergeBaseException( | |||
NoMergeBaseException.MergeBaseFailureReason.CONFLICTS_DURING_MERGE_BASE_CALCULATION, | |||
MessageFormat.format( | |||
JGitText.get().mergeRecursiveTooManyMergeBasesFor, | |||
Integer.valueOf(MAX_BASES), a.name(), | |||
b.name(), | |||
Integer.valueOf(baseCommits.size()))); | |||
JGitText.get().mergeRecursiveConflictsWhenMergingCommonAncestors, | |||
currentBase.getName(), nextBase.getName())); | |||
} | |||
} finally { | |||
inCore = oldIncore; |