diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2005-08-22 21:37:36 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2005-08-22 21:37:36 +0000 |
| commit | bac9d82b5bcaedf1c5fac692d8ce7e8628d2d31c (patch) | |
| tree | d01eab125aa4e9ae0fa2f20771380d2c053e480a /test | |
| parent | 651391cebe1b5ed1913f4d2260ec6abe31aa6b21 (diff) | |
| download | quilt-bac9d82b5bcaedf1c5fac692d8ce7e8628d2d31c.tar.gz | |
- quilt/fold.in: fold did not work when invoked from a
subdirectory; update test case.
Diffstat (limited to 'test')
| -rw-r--r-- | test/fold.test | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/test/fold.test b/test/fold.test index 1b26924..4c16922 100644 --- a/test/fold.test +++ b/test/fold.test @@ -4,7 +4,6 @@ $ mkdir patches $ cat > patches/series < patch1.diff - < patch2.diff $ cat > patches/patch1.diff < --- q.orig/file1.txt @@ -16,7 +15,15 @@ < @@ -0,0 +1 @@ < +This is file2.txt. - $ cat > patches/patch2.diff + $ quilt push -q + > Applying patch %{P}patch1.diff + > Now at patch %{P}patch1.diff + + $ quilt files + > file1.txt + > file2.txt + + $ quilt fold -q < --- q.orig/file2.txt < +++ q/file2.txt < @@ -1 +0,0 @@ @@ -26,15 +33,29 @@ < @@ -0,0 +1 @@ < +This is file3.txt. - $ quilt push -q - > Applying patch %{P}patch1.diff - > Now at patch %{P}patch1.diff + $ quilt diff | sed -e "s/\\t.*//" + > Index: d/file1.txt + > =================================================================== + > --- /dev/null + > +++ d/file1.txt + > @@ -0,0 +1 @@ + > +This is file1.txt. + > Index: d/dir/file3.txt + > =================================================================== + > --- /dev/null + > +++ d/dir/file3.txt + > @@ -0,0 +1 @@ + > +This is file3.txt. - $ quilt files - > file1.txt - > file2.txt + $ cd dir + $ quilt fold -q + < --- dir.orig/file3.txt + < +++ dir/file3.txt + < @@ -1 +1 @@ + < -This is file3.txt. + < +This is file3.txt, now modified. - $ quilt fold -q < patches/patch2.diff + $ cd .. $ quilt diff | sed -e "s/\\t.*//" > Index: d/file1.txt > =================================================================== @@ -47,7 +68,7 @@ > --- /dev/null > +++ d/dir/file3.txt > @@ -0,0 +1 @@ - > +This is file3.txt. + > +This is file3.txt, now modified. $ cd .. $ rm -rf d |