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/example1.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/example1.test')
| -rw-r--r-- | test/example1.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/example1.test b/test/example1.test index 3ab2d64..6212f89 100644 --- a/test/example1.test +++ b/test/example1.test @@ -92,16 +92,16 @@ Or ``quilt edit Oberon.txt'' $ mv Oberon.new Oberon.txt $ quilt push > Applying patch %{P}flower.diff - > patching file Oberon.txt + >~ patching file `?Oberon.txt'? > Hunk #1 FAILED at 2. - > 1 out of 1 hunk FAILED -- rejects in file Oberon.txt + >~ 1 out of 1 hunk FAILED -- rejects in file `?Oberon.txt'? > Patch %{P}flower.diff does not apply (enforce with -f) $ quilt push -f > Applying patch %{P}flower.diff - > patching file Oberon.txt + >~ patching file `?Oberon.txt'? > Hunk #1 FAILED at 2. - > 1 out of 1 hunk FAILED -- saving rejects to file Oberon.txt.rej + >~ 1 out of 1 hunk FAILED -- saving rejects to file `?Oberon.txt.rej'? > Applied patch %{P}flower.diff (forced; needs refresh) $ cat >> Oberon.txt |