Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-transplant @ 3726:752884db5037

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: recover added/removed files after failed application
author Brendan Cully <brendan@kublai.com>
date Thu, 30 Nov 2006 13:51:58 -0800
parents ea523d6f5f1a
children 889f7e74a0d9
line wrap: on
line diff
--- a/tests/test-transplant
+++ b/tests/test-transplant
@@ -67,13 +67,16 @@ foo
 bar
 baz
 EOF
+echo toremove > toremove
 hg ci -Amfoo -d '0 0'
 cat <<EOF > foo
 foo2
 bar2
 baz2
 EOF
-hg ci -mfoo2 -d '0 0'
+rm toremove
+echo added > added
+hg ci -Amfoo2 -d '0 0'
 echo bar > bar
 hg ci -Ambar -d '0 0'
 echo bar2 >> bar
@@ -84,3 +87,4 @@ hg ci -mfoobar -d '0 0'
 hg transplant 1:3
 echo merge > foo
 hg transplant --continue
+hg locate