diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 21:44:38 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 21:44:38 +0000 |
commit | 1455b44c6a3265cbfda24c695eb2dd231faa854b (patch) | |
tree | 75901808a622467a5d29c85b281622718d1ba499 /test/new.test | |
parent | e9d3b15754c61017423b3abc8cf6baab78d04a7e (diff) | |
download | quilt-1455b44c6a3265cbfda24c695eb2dd231faa854b.tar.gz |
- GNU patch 2.5 messages differ slightly from the messages of more
recent versions. Recognize the old version's output when fixing
patch's output in the push command, and also accept the old
version's output in the test suite.
Diffstat (limited to 'test/new.test')
-rw-r--r-- | test/new.test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/new.test b/test/new.test index ede6eed..31211dc 100644 --- a/test/new.test +++ b/test/new.test @@ -18,18 +18,18 @@ $ quilt push > Applying patch %{P}p.diff - > patching file f + >~ patching file `?f'? > Hunk #1 FAILED at 1. - > 1 out of 1 hunk FAILED -- rejects in file f - > patching file g + >~ 1 out of 1 hunk FAILED -- rejects in file `?f'? + >~ patching file `?g'? > Patch %{P}p.diff does not apply (enforce with -f) $ quilt push -f > Applying patch %{P}p.diff - > patching file f + >~ patching file `?f'? > Hunk #1 FAILED at 1. - > 1 out of 1 hunk FAILED -- saving rejects to file f.rej - > patching file g + >~ 1 out of 1 hunk FAILED -- saving rejects to file `?f.rej'? + >~ patching file `?g'? > Applied patch %{P}p.diff (forced; needs refresh) $ echo new > f |