diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/create-delete.test | 6 | ||||
-rw-r--r-- | test/half-applies.test | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/test/create-delete.test b/test/create-delete.test index 315edb8..43a0cf4 100644 --- a/test/create-delete.test +++ b/test/create-delete.test @@ -28,12 +28,12 @@ file creates and deletions. $ echo create > create $ rm -f delete $ patch -p1 --dry-run < patches/test.diff - > The next patch would create the file create, + >~ The next patch would create the file `?create'?, > which already exists! Assume -R? [n] > Apply anyway? [n] > Skipping patch. - >~ 1 out of 1 hunk ignored( -- saving rejects to file create.rej)? - > The next patch would delete the file delete, + >~ 1 out of 1 hunk ignored( -- saving rejects to( file)? create.rej)? + >~ The next patch would delete the file `?delete'?, > which does not exist! Assume -R? [n] > Apply anyway? [n] > Skipping patch. 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 |