diff options
Diffstat (limited to 'test/one.test')
| -rw-r--r-- | test/one.test | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/test/one.test b/test/one.test index b565b20..9131d4f 100644 --- a/test/one.test +++ b/test/one.test @@ -5,9 +5,8 @@ of the installed quilt with `make check'. (To run, type `./run one.test' in this directory.) - $ rm -rf d - $ mkdir -p d/patches - $ cd d + $ mkdir patches + $ mkdir dir $ echo "This is file one." > dir/file1 $ quilt new patch1.diff @@ -25,19 +24,19 @@ of the installed quilt with `make check'. > Nothing in patch %{P}patch1.diff $ echo "This is file two." > file2 - $ quilt diff - > Index: d/file2 + $ quilt diff -p ab + > Index: b/file2 > =================================================================== > --- /dev/null - > +++ d/file2 + > +++ b/file2 > @@ -0,0 +1 @@ > +This is file two. - $ quilt diff -z - > Index: d/file2 + $ quilt diff -z -p ab + > Index: b/file2 > =================================================================== > --- /dev/null - > +++ d/file2 + > +++ b/file2 > @@ -0,0 +1 @@ > +This is file two. @@ -46,20 +45,20 @@ of the installed quilt with `make check'. $ quilt diff -z $ echo "Another line has been added." >> dir/file1 - $ quilt diff -z - > Index: d/dir/file1 + $ quilt diff -z -p ab + > Index: b/dir/file1 > =================================================================== - > --- d.orig/dir/file1 - > +++ d/dir/file1 + > --- a/dir/file1 + > +++ b/dir/file1 > @@ -1 +1,2 @@ > This is file one. > +Another line has been added. - $ quilt diff -z dir/file1 - > Index: d/dir/file1 + $ quilt diff -z -p ab dir/file1 + > Index: b/dir/file1 > =================================================================== - > --- d.orig/dir/file1 - > +++ d/dir/file1 + > --- a/dir/file1 + > +++ b/dir/file1 > @@ -1 +1,2 @@ > This is file one. > +Another line has been added. @@ -106,10 +105,10 @@ of the installed quilt with `make check'. > File file4 added to patch %{P}subdir/patch3.diff $ rm -f file4 - $ quilt diff - > Index: d/file4 + $ quilt diff -p ab + > Index: b/file4 > =================================================================== - > --- d.orig/file4 + > --- a/file4 > +++ /dev/null > @@ -1 +0,0 @@ > -This is file 4. @@ -125,11 +124,11 @@ of the installed quilt with `make check'. > Refreshed patch %{P}patch2.diff $ echo "Another line added." >> file2 - $ quilt diff -z -P patch1 - > Index: d/file2 + $ quilt diff -z -P patch1 -p ab + > Index: b/file2 > =================================================================== - > --- d.orig/file2 - > +++ d/file2 + > --- a/file2 + > +++ b/file2 > @@ -1 +1,2 @@ > This is file two. > +Another line added. @@ -155,6 +154,3 @@ of the installed quilt with `make check'. > Removing patch %{P}patch2.diff > Removing patch %{P}patch1.diff > No patches applied - - $ cd .. - $ rm -rf d |