diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-09-09 18:27:51 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2005-09-09 18:27:51 +0000 |
| commit | 90eddd873587e6dc65161927476ecf9b2c031121 (patch) | |
| tree | bc40457c5ca0e51afa24112f78a5280cceba6ee6 /test/two.test | |
| parent | dc5babe944639e0404a7fce2f2e64155d0271e89 (diff) | |
| download | quilt-90eddd873587e6dc65161927476ecf9b2c031121.tar.gz | |
- test/*.test: Fix sed compatibility issues: do not use inplace (-i); do
not filter out tabs in patches, it's no more needed now that
--no-timestamps is used; do not use the "a" command. Based on a patch
by John Vandenberg.
Diffstat (limited to 'test/two.test')
| -rw-r--r-- | test/two.test | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/two.test b/test/two.test index 0659486..445942b 100644 --- a/test/two.test +++ b/test/two.test @@ -20,7 +20,7 @@ > Nothing in patch %{_P}patch1.diff $ echo "This is file two." > file2 - $ quilt diff | sed -e "s/\\t.*//" + $ quilt diff > Index: d/d/file2 > =================================================================== > --- /dev/null @@ -28,7 +28,7 @@ > @@ -0,0 +1 @@ > +This is file two. - $ quilt diff -z | sed -e "s/\\t.*//" + $ quilt diff -z > Index: d/d/file2 > =================================================================== > --- /dev/null @@ -41,7 +41,7 @@ $ quilt diff -z $ echo "Another line has been added." >> dir/file1 - $ quilt diff -z | sed -e "s/\\t.*//" + $ quilt diff -z > Index: d/d/dir/file1 > =================================================================== > --- d.orig/d/dir/file1 @@ -51,7 +51,7 @@ > +Another line has been added. $ cd dir - $ quilt diff -z file1 | sed -e "s/\\t.*//" + $ quilt diff -z file1 > Index: d/d/dir/file1 > =================================================================== > --- d.orig/d/dir/file1 @@ -108,7 +108,7 @@ > File d/file4 added to patch %{_P}subdir/patch3.diff $ rm file4 - $ quilt diff | sed -e "s/\\t.*//" + $ quilt diff > Index: d/d/file4 > =================================================================== > --- d.orig/d/file4 @@ -127,8 +127,7 @@ > Refreshed patch %{_P}patch2.diff $ echo "Another line added." >> file2 - $ quilt diff -z -P patch1 | sed -e "s/\\t.*//" - > More recent patches modify files in patch %{_P}patch1.diff + $ quilt diff -z -P patch1 > Index: d/d/file2 > =================================================================== > --- d.orig/d/file2 @@ -136,6 +135,7 @@ > @@ -1 +1,2 @@ > This is file two. > +Another line added. + > More recent patches modify files in patch %{_P}patch1.diff $ quilt refresh patch1 > More recent patches modify files in patch %{_P}patch1.diff. Enforce refresh with -f. |