Mercurial > hg
changeset 4901:27414950abf5
Update test output to reflect small changes in patch chattiness.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 17 Jul 2007 09:39:30 -0700 |
| parents | e56c7e05c7e6 |
| children | 5cbdea5735f4 8a53b39cd402 ad09ce1d393c |
| files | tests/test-mq.out tests/test-transplant.out |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-mq.out Tue Jul 17 09:39:30 2007 -0700 +++ b/tests/test-mq.out Tue Jul 17 09:39:30 2007 -0700 @@ -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
--- a/tests/test-transplant.out Tue Jul 17 09:39:30 2007 -0700 +++ b/tests/test-transplant.out Tue Jul 17 09:39:30 2007 -0700 @@ -101,17 +101,17 @@ 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 -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 -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 -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