diff options
| -rw-r--r-- | quilt.changes | 8 | ||||
| -rw-r--r-- | quilt/push.in | 4 | ||||
| -rw-r--r-- | test/comments.test | 2 | ||||
| -rw-r--r-- | test/conflicts.test | 2 | ||||
| -rw-r--r-- | test/create-delete.test | 6 | ||||
| -rw-r--r-- | test/example1.test | 8 | ||||
| -rw-r--r-- | test/import.test | 2 | ||||
| -rw-r--r-- | test/new.test | 12 | ||||
| -rw-r--r-- | test/one.test | 2 | ||||
| -rw-r--r-- | test/two.test | 2 |
10 files changed, 28 insertions, 20 deletions
diff --git a/quilt.changes b/quilt.changes index 9d84da8..1999622 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sat Jan 21 22:37:29 CET 2006 - agruen@suse.de + +- 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. + +------------------------------------------------------------------- Sat Jan 21 21:32:59 CET 2006 - agruen@suse.de - test/run: Support regex matching in test scripts. diff --git a/quilt/push.in b/quilt/push.in index 0a349c7..c50529c 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -132,13 +132,13 @@ cleanup_patch_output() { # reject file, so this does not help us. awk ' - { gsub(/ -- saving rejects to file .*/, "") } + { gsub(/ -- saving rejects to (file )?.*/, "") } { print } ' else awk ' /^patching file / { filename = substr($0, 15) } - { gsub(/ -- saving rejects to file .*/, + { gsub(/ -- saving rejects to (file )?.*/, " -- rejects in file " filename) } { print } ' diff --git a/test/comments.test b/test/comments.test index cb440f6..f6115ab 100644 --- a/test/comments.test +++ b/test/comments.test @@ -23,7 +23,7 @@ accidentally removed. $ quilt push > Applying patch %{P}test.diff - > patching file f + >~ patching file `?f'? > > Now at patch %{P}test.diff diff --git a/test/conflicts.test b/test/conflicts.test index bc8b600..f543678 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -66,7 +66,7 @@ anymore, then the patch is fixed. $ quilt push -qf > Applying patch %{P}a.diff - > 1 out of 2 hunks FAILED -- saving rejects to file one.txt.rej + >~ 1 out of 2 hunks FAILED -- saving rejects to file `?one.txt.rej'? > Applied patch %{P}a.diff (forced; needs refresh) $ mv one.txt one.x diff --git a/test/create-delete.test b/test/create-delete.test index 8040f62..7bbfa75 100644 --- a/test/create-delete.test +++ b/test/create-delete.test @@ -30,12 +30,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/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 diff --git a/test/import.test b/test/import.test index 3f7ebfc..4f10ca1 100644 --- a/test/import.test +++ b/test/import.test @@ -31,7 +31,7 @@ $ quilt push > Applying patch patches/patch1.diff - > patching file f + >~ patching file `?f'? > > Now at patch patches/patch1.diff 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 diff --git a/test/one.test b/test/one.test index 70764cb..7e9c44e 100644 --- a/test/one.test +++ b/test/one.test @@ -95,7 +95,7 @@ of the installed quilt with `make check'. $ quilt push > Applying patch %{P}patch2.diff - > patching file dir/file3 + >~ patching file `?dir/file3'? > > Now at patch %{P}patch2.diff diff --git a/test/two.test b/test/two.test index bb7a0b7..b0fe485 100644 --- a/test/two.test +++ b/test/two.test @@ -96,7 +96,7 @@ $ quilt push > Applying patch %{_P}patch2.diff - > patching file d/dir/file3 + >~ patching file `?d/dir/file3'? > > Now at patch %{_P}patch2.diff |