facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

Update test output to reflect small changes in patch chattiness.

Browse Source
This commit is contained in:
Bryan O'Sullivan 2007-07-17 09:39:30 -07:00
parent 6c741e45c0
commit bbc8c72100
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test-mq.out
View File

@ -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

12
tests/test-transplant.out
View File

@ -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