From bbc8c721007b508b4576dd429ad07feffa3851fa Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Tue, 17 Jul 2007 09:39:30 -0700 Subject: [PATCH] Update test output to reflect small changes in patch chattiness. --- tests/test-mq.out | 3 ++- tests/test-transplant.out | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/test-mq.out b/tests/test-mq.out index a7d4e53f82..0ec4b4cf06 100644 --- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -262,7 +262,8 @@ M a 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 dbe76aba1f..251080c202 100644 --- a/tests/test-transplant.out +++ b/tests/test-transplant.out @@ -101,17 +101,17 @@ removing toremove 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