diff -r ca58f6475f1d -r 4134686b83e1 tests/test-transplant.t --- a/tests/test-transplant.t Thu Sep 16 16:12:26 2010 -0500 +++ b/tests/test-transplant.t Thu Sep 16 17:51:32 2010 -0500 @@ -207,6 +207,7 @@ 1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed to apply abort: fix up the merge and run hg transplant --continue + [255] transplant -c shouldn't use an old changeset @@ -220,6 +221,7 @@ 1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed to apply abort: fix up the merge and run hg transplant --continue + [255] $ hg transplant --continue a1e30dd1b8e7 transplanted as f1563cf27039 $ hg transplant 1:3 @@ -320,6 +322,7 @@ 1 out of 1 hunks FAILED -- saving rejects to file b1.rej patch failed to apply abort: fix up the merge and run hg transplant --continue + [255] $ cd .. @@ -345,6 +348,7 @@ $ python -c "file('b', 'wb').write('b\r\nb\r\n')" $ hg ci -m addb nothing changed + [1] $ hg transplant -s ../twin1 tip applying 2e849d776c17 2e849d776c17 transplanted to 589cea8ba85b