diff tests/test-transplant.out @ 9995:eba6c8687fd2 stable

transplant: fix small bug when a patch fails while using --filter
author Sune Foldager <cryo@cyanite.org>
date Thu, 03 Dec 2009 11:06:44 +0100
parents a3d73b3e1f8a
children a4fbbe0fbc38
line wrap: on
line diff
--- a/tests/test-transplant.out	Thu Dec 03 14:14:44 2009 +0900
+++ b/tests/test-transplant.out	Thu Dec 03 11:06:44 2009 +0100
@@ -159,6 +159,17 @@
 2  b2
 1  b1
 0  r2
+% test filter with failed patch
+0 files updated, 0 files merged, 3 files removed, 0 files unresolved
+adding b1
+adding test-filter
+created new head
+file b1 already exists
+1 out of 1 hunks FAILED -- saving rejects to file b1.rej
+abort: Fix up the merge and run hg transplant --continue
+filtering
+applying 348b36d0b6a5
+patch failed to apply
 % test with a win32ext like setup (differing EOLs)
 adding a
 adding b