summaryrefslogtreecommitdiffstats
path: root/test/fold.test
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2003-11-27 16:15:40 +0000
committerAndreas Gruenbacher <agruen@suse.de>2003-11-27 16:15:40 +0000
commita3a058b8dc41a2e5d7bb2b813ccb1e389067dcc3 (patch)
treeafc2c7be1ad3340b7051cb95be93a30f7e9a8990 /test/fold.test
parentb4ea7b77bf697ff6c103bf21132407812d86b26d (diff)
downloadquilt-a3a058b8dc41a2e5d7bb2b813ccb1e389067dcc3.tar.gz
- `quilt fold' did not create directories for additional files,
and the code for recovering from failures was wrong.
Diffstat (limited to 'test/fold.test')
-rw-r--r--test/fold.test18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/fold.test b/test/fold.test
index b0aeb90..ec0a256 100644
--- a/test/fold.test
+++ b/test/fold.test
@@ -21,8 +21,8 @@
< +++ q/file2.txt
< @@ -1 +0,0 @@
< -This is file2.txt.
- < --- q.orig/file3.txt
- < +++ q/file3.txt
+ < --- q.orig/dir/file3.txt
+ < +++ q/dir/file3.txt
< @@ -0,0 +1 @@
< +This is file3.txt.
@@ -36,22 +36,22 @@
$ quilt fold -q < patches/patch2.diff
$ quilt files
+ > dir/file3.txt
> file1.txt
- > file3.txt
$ quilt diff | sed -e "s/\\t.*//"
+ > Index: d/dir/file3.txt
+ > ===================================================================
+ > --- d.orig/dir/file3.txt
+ > +++ d/dir/file3.txt
+ > @@ -0,0 +1 @@
+ > +This is file3.txt.
> Index: d/file1.txt
> ===================================================================
> --- d.orig/file1.txt
> +++ d/file1.txt
> @@ -0,0 +1 @@
> +This is file1.txt.
- > Index: d/file3.txt
- > ===================================================================
- > --- d.orig/file3.txt
- > +++ d/file3.txt
- > @@ -0,0 +1 @@
- > +This is file3.txt.
$ cd ..
$ rm -rf d