]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 95ef1e8) | patch
Implement recursive merge strategy 13/8113/26
authorGeorge C. Young <geyoung@rim.com>
Thu, 21 Feb 2013 18:44:40 +0000 (13:44 -0500)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 22 Feb 2013 22:51:50 +0000 (23:51 +0100)
commitab99b78ca08a6b52e9ae8b49afa04dd16496f2ac
treea3e17c1ed142b8a8b2e7ff9431b88eb2f6add786tree | snapshot
parent95ef1e83d0fa7b82adcb93b734a618a570d32240commit | diff
Implement recursive merge strategy

Extend ResolveMerger with RecursiveMerger to merge two tips
that have up to 200 bases.

Bug: 380314
CQ: 6854
Change-Id: I6292bb7bda55c0242a448a94956f2d6a94fddbaa
Also-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 files changed:
README.md diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/RecursiveMergerTest.java [new file with mode: 0644] blob
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/errors/NoMergeBaseException.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java [new file with mode: 0644] blob
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit