summaryrefslogtreecommitdiffstats
path: root/test/two.test
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2004-06-10 20:08:37 +0000
committerAndreas Gruenbacher <agruen@suse.de>2004-06-10 20:08:37 +0000
commit71d64f6c066574e47dfc0363efc576dd21474f8e (patch)
treefba3c6f2e10b661c208d0c06d32c4b2ad4ced93b /test/two.test
parent27a5cb45dd2f3fa87f295fb3c5de91de96ba3a7b (diff)
downloadquilt-71d64f6c066574e47dfc0363efc576dd21474f8e.tar.gz
- Add meta-data version check/upgrade code from Martin Quinson and
me; new `quilt upgrade' command. - Handle new/removed files correctly in generated patches: If the old or new file is missing, the file name in the patch should be /dev/null. Fix test suite accordingly, and add test/create-delete.diff. GNU patch recognizes this, and does additional file existance tests when a patch creates/deletes a file. Also use the --label option of GNU diff instead of hand-editing file name headers. - Add test/Makefile for running the test suite. Note: The tests run against the installed version of quilt! - Bump version to 0.34.
Diffstat (limited to 'test/two.test')
-rw-r--r--test/two.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/two.test b/test/two.test
index 372dd72..bbacbae 100644
--- a/test/two.test
+++ b/test/two.test
@@ -23,7 +23,7 @@
$ quilt diff | sed -e "s/\\t.*//"
> Index: d/d/file2
> ===================================================================
- > --- d.orig/d/file2
+ > --- /dev/null
> +++ d/d/file2
> @@ -0,0 +1 @@
> +This is file two.
@@ -31,7 +31,7 @@
$ quilt diff -z | sed -e "s/\\t.*//"
> Index: d/d/file2
> ===================================================================
- > --- d.orig/d/file2
+ > --- /dev/null
> +++ d/d/file2
> @@ -0,0 +1 @@
> +This is file two.
@@ -112,7 +112,7 @@
> Index: d/d/file4
> ===================================================================
> --- d.orig/d/file4
- > +++ d/d/file4
+ > +++ /dev/null
> @@ -1 +0,0 @@
> -This is file 4.