]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 99608f0) | patch
Add pgm test for checkout of existing branch with checkout conflict 59/19059/8
authorAxel Richard <axel.richard@obeo.fr>
Thu, 28 Nov 2013 13:14:32 +0000 (14:14 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 2 Dec 2013 21:55:55 +0000 (22:55 +0100)
commit1128326adde8f2c98bddc58ce1879fca7b2cd41f
treec78c3fab2dd41a0974589d0b807aed8c08fa91e2tree | snapshot
parent99608f0b9a10abe0f8426f0ff5bc51eb6a2ae866commit | diff
Add pgm test for checkout of existing branch with checkout conflict

Add a test that checks out an existing branch with a dirty working tree
and involves a checkout conflict. This test should pass with a message:
"error: Your local changes to the following files would be overwritten
by checkout: a".

Change-Id: I5428a04a7630d9e0101404ea1aedd796f127bd7d
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CheckoutTest.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit