tests/test-transplant.t
changeset 23781 49caef455912
parent 23452 86c0d8c1484f
child 25472 4d2b9b304ad0
child 25678 0c201666fdc6
--- a/tests/test-transplant.t	Thu Jan 08 21:30:22 2015 +0100
+++ b/tests/test-transplant.t	Thu Jan 08 21:36:12 2015 -0800
@@ -768,6 +768,22 @@
   searching for changes
   applying 7a7d57e15850
   skipping emptied changeset 7a7d57e15850
+
+Test empty result in --continue
+
+  $ hg transplant -s ../binarysource 1
+  searching for changes
+  applying 645035761929
+  file b already exists
+  1 out of 1 hunks FAILED -- saving rejects to file b.rej
+  patch failed to apply
+  abort: fix up the merge and run hg transplant --continue
+  [255]
+  $ hg status
+  ? b.rej
+  $ hg transplant --continue
+  645035761929 skipped due to empty diff
+
   $ cd ..
 
 Explicitly kill daemons to let the test exit on Windows