summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2003-03-23 20:39:25 +0000
committerAndreas Gruenbacher <agruen@suse.de>2003-03-23 20:39:25 +0000
commitf1f7076cab213d739a635d2e2117d85c79a38e33 (patch)
tree42d2e574e238b008b4ffd05b929ea33993cc1c74
parenta99811be10ebb871f1e458fd3692540efac27106 (diff)
downloadquilt-f1f7076cab213d739a635d2e2117d85c79a38e33.tar.gz
Update test script to reflect recent patch format changes.
-rw-r--r--quilt.changes5
-rw-r--r--test/one.test9
2 files changed, 12 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes
index 73352e6..1a119cc 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Sun Mar 23 21:37:20 CET 2003 - agruen@suse.de
+
+- Update test script to reflect recent patch format changes.
+
+-------------------------------------------------------------------
Sat Mar 22 12:28:43 CET 2003 - agruen@suse.de
- Also substitute @SED@ and @AWK@.
diff --git a/test/one.test b/test/one.test
index 6ed5090..e49eb66 100644
--- a/test/one.test
+++ b/test/one.test
@@ -23,12 +23,14 @@ file2
$ echo "This is file two." > file2
$ quilt diff | sed -e "s/\\t.*//"
Index: test/file2
---- test~patch1/file2
+===================================================================
+--- test.orig/file2
+++ test/file2
@@ -0,0 +1 @@
+This is file two.
$ quilt diff -z | sed -e "s/\\t.*//"
Index: test/file2
+===================================================================
--- test.orig/file2
+++ test/file2
@@ -0,0 +1 @@
@@ -39,6 +41,7 @@ $ quilt diff -z
$ echo "Another line has been added." >> dir/file1
$ quilt diff -z | sed -e "s/\\t.*//"
Index: test/dir/file1
+===================================================================
--- test.orig/dir/file1
+++ test/dir/file1
@@ -1 +1,2 @@
@@ -77,7 +80,8 @@ File file4 added to patch subdir/patch3
$ rm file4
$ quilt diff | sed -e "s/\\t.*//"
Index: test/file4
---- test~subdir_patch3/file4
+===================================================================
+--- test.orig/file4
+++ test/file4
@@ -1 +0,0 @@
-This is file 4.
@@ -91,6 +95,7 @@ Refreshed patch patch2
$ echo "Another line added." >> file2
$ quilt diff -z -P patch1 | sed -e "s/\\t.*//"
Index: test/file2
+===================================================================
--- test.orig/file2
+++ test/file2
@@ -1 +1,2 @@