Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-transplant.out @ 3724:ea523d6f5f1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: fix --continue; add --continue test
author Brendan Cully <brendan@kublai.com>
date Thu, 30 Nov 2006 11:09:25 -0800
parents 198173f3957c
children 752884db5037
line wrap: on
line diff
--- a/tests/test-transplant.out
+++ b/tests/test-transplant.out
@@ -75,3 +75,18 @@ 4 files updated, 0 files merged, 0 files
 searching for changes
 applying 4333daefcb15
 4333daefcb15 transplanted to 5f42c04e07cc
+% transplant --continue
+adding foo
+adding bar
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+applying c029d661401c
+foo
+Hunk #1 FAILED at 1.
+1 out of 1 hunk FAILED -- saving rejects to file foo.rej
+patch command failed: exited with status 1
+abort: Fix up the merge and run hg transplant --continue
+c029d661401c transplanted as 1b09cda4cf1b
+applying 67f0722fdc4f
+67f0722fdc4f transplanted to faa04033bb41
+applying 84c5126bd0d2
+84c5126bd0d2 transplanted to b35f4019ccc9