test/add-filename-check.test | 4 ++-- test/comments.test | 6 +++--- test/conflicts.test | 2 +- test/create-delete.test | 2 +- test/delete.test | 2 +- test/dotglob.test | 2 +- test/example1.test | 3 ++- test/failpop.test | 2 +- test/fold.test | 3 +-- test/formats.test | 2 +- test/header.test | 2 +- test/merge.test | 3 +-- test/missing.test | 3 +-- test/new-nosubdir.test | 4 ++-- test/one.test | 3 ++- test/perms.test | 3 ++- test/remove2.test | 2 +- test/rename.test | 2 +- test/snapshot.test | 2 +- test/snapshot2.test | 4 +++- test/sort.test | 2 +- test/subdir.test | 2 +- test/trailing-ws.test | 2 +- test/two.test | 4 +++- 24 files changed, 35 insertions(+), 31 deletions(-) --- quilt.orig/test/add-filename-check.test 2005-04-29 09:32:05.000000000 +0200 +++ quilt/test/add-filename-check.test 2005-09-23 10:31:07.000000000 +0200 @@ -1,6 +1,6 @@ -$ mkdir d +$ mkdir -p d/patches $ cd d -$ mkdir patches + $ quilt new test.diff >Patch patches/test.diff is now on top --- quilt.orig/test/comments.test 2005-06-27 00:08:59.000000000 +0200 +++ quilt/test/comments.test 2005-09-23 10:31:58.000000000 +0200 @@ -1,9 +1,9 @@ Regresion test case: Empty lines in patch descriptions were accidentally removed. - $ mkdir d + $ mkdir -p d/patches $ cd d - $ mkdir patches + $ echo one > f $ cat > patches/test.diff < C1 @@ -75,6 +75,6 @@ > @@ -1 +1 @@ > -one > +two + $ cd .. $ rm -rf d - --- quilt.orig/test/conflicts.test 2004-10-17 22:42:30.000000000 +0200 +++ quilt/test/conflicts.test 2005-09-23 10:32:09.000000000 +0200 @@ -2,7 +2,7 @@ source file. The source file is modified until the patch doesn't apply anymore, then the patch is fixed. - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > one.txt --- quilt.orig/test/create-delete.test 2005-07-19 00:23:41.000000000 +0200 +++ quilt/test/create-delete.test 2005-09-23 10:32:18.000000000 +0200 @@ -1,7 +1,7 @@ Check whether quilt generates patches properly so that GNU patch recognizes file creates and deletions. - $ mkdir d + $ mkdir -p d/patches $ cd d $ echo delete > delete --- quilt.orig/test/delete.test 2005-07-29 18:54:21.000000000 +0200 +++ quilt/test/delete.test 2005-09-23 10:32:25.000000000 +0200 @@ -1,6 +1,6 @@ Test the delete command. - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > test.txt --- quilt.orig/test/dotglob.test 2004-09-22 13:48:34.000000000 +0200 +++ quilt/test/dotglob.test 2005-09-23 10:32:38.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ quilt new dotglob.diff --- quilt.orig/test/example1.test 2005-09-21 21:09:52.000000000 +0200 +++ quilt/test/example1.test 2005-09-23 10:32:51.000000000 +0200 @@ -1,8 +1,9 @@ The text used here was taken from: http://the-tech.mit.edu/Shakespeare/midsummer/full.html - $ mkdir example1 + $ mkdir -p example1/patches $ cd example1 + $ cat > Oberon.txt < Yet mark'd I where the bolt of Cupid fell: < It fell upon a little western flower, --- quilt.orig/test/failpop.test 2004-10-17 22:42:30.000000000 +0200 +++ quilt/test/failpop.test 2005-09-23 10:33:04.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > test.txt --- quilt.orig/test/fold.test 2005-09-21 21:10:26.000000000 +0200 +++ quilt/test/fold.test 2005-09-23 10:33:13.000000000 +0200 @@ -1,7 +1,6 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d - $ mkdir patches $ cat > patches/series < patch1.diff --- quilt.orig/test/formats.test 2005-06-08 17:31:21.000000000 +0200 +++ quilt/test/formats.test 2005-09-23 10:33:24.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > test.txt --- quilt.orig/test/header.test 2005-07-18 16:55:03.000000000 +0200 +++ quilt/test/header.test 2005-09-23 10:33:35.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ echo foo > foo --- quilt.orig/test/merge.test 2004-07-09 09:26:41.000000000 +0200 +++ quilt/test/merge.test 2005-09-23 10:33:52.000000000 +0200 @@ -1,6 +1,6 @@ Test the patch merging functionality of `quilt diff'. - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > abc.txt @@ -8,7 +8,6 @@ < b < c - $ mkdir patches $ cat > patches/series < a.diff < b.diff --- quilt.orig/test/missing.test 2005-07-29 18:14:28.000000000 +0200 +++ quilt/test/missing.test 2005-09-23 10:34:02.000000000 +0200 @@ -1,7 +1,6 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d - $ mkdir patches $ cat > patches/series < missing1.diff < missing2.diff --- quilt.orig/test/new-nosubdir.test 2004-10-17 22:42:30.000000000 +0200 +++ quilt/test/new-nosubdir.test 2005-09-23 10:34:30.000000000 +0200 @@ -1,7 +1,7 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d - $ mkdir patches sub + $ mkdir sub $ cd sub $ quilt new here.diff > Patch %{_P}here.diff is now on top --- quilt.orig/test/one.test 2005-09-07 19:31:50.000000000 +0200 +++ quilt/test/one.test 2005-09-23 10:35:20.000000000 +0200 @@ -5,8 +5,9 @@ (To run, type `./run one.test' in this directory.) - $ mkdir d + $ mkdir -p d/patches $ cd d + $ mkdir dir $ echo "This is file one." > dir/file1 $ quilt new patch1.diff --- quilt.orig/test/perms.test 2005-09-06 18:32:22.000000000 +0200 +++ quilt/test/perms.test 2005-09-23 10:35:34.000000000 +0200 @@ -1,6 +1,7 @@ $ umask 022 - $ mkdir d + $ mkdir -p d/patches $ cd d + $ echo foo > foo $ chmod 704 foo $ ls -l foo | awk '{ print $1,$NF }' --- quilt.orig/test/remove2.test 2005-06-01 13:20:32.000000000 +0200 +++ quilt/test/remove2.test 2005-09-23 10:35:57.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ quilt new remove.patch --- quilt.orig/test/rename.test 2005-06-09 14:48:10.000000000 +0200 +++ quilt/test/rename.test 2005-09-23 10:36:06.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > announce.txt --- quilt.orig/test/snapshot.test 2004-07-09 09:26:42.000000000 +0200 +++ quilt/test/snapshot.test 2005-09-23 10:36:15.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ quilt new snapshot --- quilt.orig/test/snapshot2.test 2004-07-12 02:07:04.000000000 +0200 +++ quilt/test/snapshot2.test 2005-09-23 10:36:40.000000000 +0200 @@ -1,5 +1,7 @@ - $ mkdir -p d/d + $ mkdir -p d/patches $ cd d + + $ mkdir d $ quilt new snapshot > Patch %{P}snapshot is now on top --- quilt.orig/test/sort.test 2005-09-23 10:27:36.000000000 +0200 +++ quilt/test/sort.test 2005-09-23 10:36:51.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ quilt new sort.diff --- quilt.orig/test/subdir.test 2005-09-21 21:10:46.000000000 +0200 +++ quilt/test/subdir.test 2005-09-23 10:37:01.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ mkdir subdir --- quilt.orig/test/trailing-ws.test 2005-06-18 20:03:58.000000000 +0200 +++ quilt/test/trailing-ws.test 2005-09-23 10:37:10.000000000 +0200 @@ -1,4 +1,4 @@ - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > a --- quilt.orig/test/two.test 2005-09-07 19:30:56.000000000 +0200 +++ quilt/test/two.test 2005-09-23 10:37:29.000000000 +0200 @@ -1,7 +1,9 @@ (To run, type `./run two.test' in this directory.) - $ mkdir -p d/d + $ mkdir -p d/patches $ cd d + + $ mkdir d $ quilt new patch1.diff > Patch %{P}patch1.diff is now on top