]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dd453f4) | patch
TestRepository: Add a cherryPick method 22/44122/4
authorDave Borowitz <dborowitz@google.com>
Wed, 18 Mar 2015 17:46:41 +0000 (10:46 -0700)
committerDave Borowitz <dborowitz@google.com>
Mon, 23 Mar 2015 20:03:31 +0000 (13:03 -0700)
commitf1a15f7eb09183124ea645a8bfc16a03d58fd385
tree8583a1146018ef0534912f7709154804f6bb1b54tree | snapshot
parentdd453f4185c8e7e9608605a35abd4ac4eaadba76commit | diff
TestRepository: Add a cherryPick method

CherryPickCommand only works on a non-bare repository, as it must
modify the working tree and index in case of a merge conflict. In
tests, being able to recover from a merge conflict is less important,
as the caller should be able to control the full contents of files in
advance of the cherry-pick.

Change-Id: Ic332e44df1308b9336e884666b08c1f6db64513d
org.eclipse.jgit.junit/META-INF/MANIFEST.MF diff | blob | history
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit