diff options
Diffstat (limited to 'test/half-applies.test')
| -rw-r--r-- | test/half-applies.test | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/half-applies.test b/test/half-applies.test index 258b225..1702a03 100644 --- a/test/half-applies.test +++ b/test/half-applies.test @@ -11,23 +11,23 @@ $ mv bar.orig bar $ echo foorab.diff -p0 > patches/series $ quilt push > Applying patch patches/foorab.diff -> patching file foo -> patching file bar +>~ patching file `?foo'? +>~ patching file `?bar'? > Hunk #1 FAILED at 1. -> 1 out of 1 hunk FAILED -- rejects in file bar +>~ 1 out of 1 hunk FAILED -- rejects in file `?bar'? > Patch patches/foorab.diff does not apply (enforce with -f) $ quilt push > Applying patch patches/foorab.diff -> patching file foo -> patching file bar +>~ patching file `?foo'? +>~ patching file `?bar'? > Hunk #1 FAILED at 1. -> 1 out of 1 hunk FAILED -- rejects in file bar +>~ 1 out of 1 hunk FAILED -- rejects in file `?bar'? > Patch patches/foorab.diff does not apply (enforce with -f) $ quilt push -qf > Applying patch patches/foorab.diff -> 1 out of 1 hunk FAILED -- saving rejects to file bar.rej +>~ 1 out of 1 hunk FAILED( -- saving rejects to( file)? bar.rej)? > Applied patch patches/foorab.diff (forced; needs refresh) $ quilt diff |