diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2014-06-26 13:42:21 +0200 |
|---|---|---|
| committer | Christian Halstrick <christian.halstrick@sap.com> | 2014-07-28 14:43:22 +0200 |
| commit | 289b7c60a9e232f7b37829c5aad858c7c13286b7 (patch) | |
| tree | 7a51956bd78935a766f08e5b24cf18a77a0817a5 /org.eclipse.jgit/src | |
| parent | 0c4553d28a34dfb64f4af68032a9a33ca297975e (diff) | |
| download | jgit-289b7c60a9e232f7b37829c5aad858c7c13286b7.tar.gz jgit-289b7c60a9e232f7b37829c5aad858c7c13286b7.zip | |
Fixed message for exception thrown during recursive merge
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: Ia3c058d5575decdefd50390ed83b63668d31c1d1
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index f075db3e57..ed94514924 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -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; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java index cce3de9b2d..885d88e5ce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java @@ -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; |