diff --git a/tests/test-mq.out b/tests/test-mq.out index e56c7e05c7e64130765ab576ad19d06b95694e07_dGVzdHMvdGVzdC1tcS5vdXQ=..27414950abf5102b3488fbb6ee27fa6de2a752d8_dGVzdHMvdGVzdC1tcS5vdXQ= 100644 --- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -262,7 +262,8 @@ Patch queue now empty applying foo applying bar -1 out of 1 hunk ignored -- saving rejects to file foo.rej +file foo already exists +1 out of 1 hunk FAILED -- saving rejects to file foo.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir Errors during apply, please fix and refresh bar diff --git a/tests/test-transplant.out b/tests/test-transplant.out index e56c7e05c7e64130765ab576ad19d06b95694e07_dGVzdHMvdGVzdC10cmFuc3BsYW50Lm91dA==..27414950abf5102b3488fbb6ee27fa6de2a752d8_dGVzdHMvdGVzdC10cmFuc3BsYW50Lm91dA== 100644 --- a/tests/test-transplant.out +++ b/tests/test-transplant.out @@ -101,6 +101,6 @@ adding bar 2 files updated, 0 files merged, 2 files removed, 0 files unresolved applying a1e30dd1b8e7 -foo -Hunk #1 FAILED at 1. +patching file foo +Hunk #1 FAILED at 0 1 out of 1 hunk FAILED -- saving rejects to file foo.rej @@ -106,5 +106,5 @@ 1 out of 1 hunk FAILED -- saving rejects to file foo.rej -patch command failed: exited with status 1 +patch failed to apply abort: Fix up the merge and run hg transplant --continue 1 files updated, 0 files merged, 1 files removed, 0 files unresolved applying a1e30dd1b8e7 @@ -108,6 +108,6 @@ abort: Fix up the merge and run hg transplant --continue 1 files updated, 0 files merged, 1 files removed, 0 files unresolved applying a1e30dd1b8e7 -foo -Hunk #1 FAILED at 1. +patching file foo +Hunk #1 FAILED at 0 1 out of 1 hunk FAILED -- saving rejects to file foo.rej @@ -113,5 +113,5 @@ 1 out of 1 hunk FAILED -- saving rejects to file foo.rej -patch command failed: exited with status 1 +patch failed to apply abort: Fix up the merge and run hg transplant --continue a1e30dd1b8e7 transplanted as f1563cf27039 skipping already applied revision 1:a1e30dd1b8e7