diff options
Diffstat (limited to 'test/fold.test')
| -rw-r--r-- | test/fold.test | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/test/fold.test b/test/fold.test index fa84a39..aa1a79e 100644 --- a/test/fold.test +++ b/test/fold.test @@ -1,6 +1,4 @@ - $ rm -rf d - $ mkdir -p d/patches - $ cd d + $ mkdir patches $ cat > patches/series < patch1.diff @@ -33,17 +31,17 @@ < @@ -0,0 +1 @@ < +This is file3.txt. - $ quilt diff - > Index: d/file1.txt + $ quilt diff -p ab + > Index: b/file1.txt > =================================================================== > --- /dev/null - > +++ d/file1.txt + > +++ b/file1.txt > @@ -0,0 +1 @@ > +This is file1.txt. - > Index: d/dir/file3.txt + > Index: b/dir/file3.txt > =================================================================== > --- /dev/null - > +++ d/dir/file3.txt + > +++ b/dir/file3.txt > @@ -0,0 +1 @@ > +This is file3.txt. @@ -56,19 +54,16 @@ < +This is file3.txt, now modified. $ cd .. - $ quilt diff - > Index: d/file1.txt + $ quilt diff -p ab + > Index: b/file1.txt > =================================================================== > --- /dev/null - > +++ d/file1.txt + > +++ b/file1.txt > @@ -0,0 +1 @@ > +This is file1.txt. - > Index: d/dir/file3.txt + > Index: b/dir/file3.txt > =================================================================== > --- /dev/null - > +++ d/dir/file3.txt + > +++ b/dir/file3.txt > @@ -0,0 +1 @@ > +This is file3.txt, now modified. - - $ cd .. - $ rm -rf d |