summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2003-10-31 15:53:54 +0000
committerAndreas Gruenbacher <agruen@suse.de>2003-10-31 15:53:54 +0000
commit6444d13378279cfeb1477e6b68b7baf07cf6dbc4 (patch)
tree46d78f80db674382b71f53fdec0981d622c64524 /test
parent26dbad21e5113e900bf2067ec94fdc5cf23bdfbe (diff)
downloadquilt-6444d13378279cfeb1477e6b68b7baf07cf6dbc4.tar.gz
- No longer verify if patches remove cleanly by reverse applying
them: This doesn't always succeed, and the the equivalent of `quilt diff -z' should suffice, anyway. - Add `touch .pc/$patch' after successful refresh: Speeds up `quilt pop' after a refresh. - Update test suite. - apatch was printing a spurious newline.
Diffstat (limited to 'test')
-rw-r--r--test/conflicts.test2
-rw-r--r--test/one.test4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/conflicts.test b/test/conflicts.test
index 1b16f36..b8c6d11 100644
--- a/test/conflicts.test
+++ b/test/conflicts.test
@@ -60,7 +60,7 @@ anymore, then the patch is fixed.
$ sed -e "s/^\\([123567]\\)\$/\\1-/" one.orig > one.txt
$ quilt push -q
> Applying a
- > 1 out of 2 hunks FAILED -- saving rejects to file one.txt.rej
+ > 1 out of 2 hunks FAILED -- rejects in file one.txt
> Patch a does not apply (enforce with -f)
$ quilt push -qf
diff --git a/test/one.test b/test/one.test
index b5bbeb1..d1298c5 100644
--- a/test/one.test
+++ b/test/one.test
@@ -76,7 +76,7 @@ of the installed quilt with `make check'.
$ quilt pop -R
> Removing patch2
- > patching file dir/file3
+ > Removing dir/file3
>
> Now at patch patch1
@@ -138,7 +138,7 @@ of the installed quilt with `make check'.
$ echo "Another line here, too." >> dir/file3
$ quilt pop -R
> Removing subdir/patch3
- > patching file file4
+ > Restoring file4
>
> Now at patch patch2