Skip to content
Snippets Groups Projects
Commit 27414950 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

Update test output to reflect small changes in patch chattiness.

parent e56c7e05
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment