diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2004-01-31 13:44:56 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2004-01-31 13:44:56 +0000 |
commit | 62afdab5581516fb7c6f055572ceb81d4c1cc2e9 (patch) | |
tree | f73b5fc7f521c575357a3afe04a89a1de2ab76ec /test/merge.test | |
parent | c4189640171632e4b3812dcc6a82b118c682b6b3 (diff) | |
download | quilt-62afdab5581516fb7c6f055572ceb81d4c1cc2e9.tar.gz |
- No longer remove common extensions (.dif, .diff, .patch, .gz,
.bz2) from patch names. This allows patches in the same series
that only differ by extension, and cleans up the scripts a
little. Also don't remove extensions when printing patch names.
- Remove unused diffstat code.
Diffstat (limited to 'test/merge.test')
-rw-r--r-- | test/merge.test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/merge.test b/test/merge.test index af85b4a..27dcd34 100644 --- a/test/merge.test +++ b/test/merge.test @@ -36,10 +36,10 @@ Test the patch merging functionality of `quilt diff'. < +c+ $ quilt push -qa - > Applying a - > Applying b - > Applying c - > Now at patch c + > Applying a.diff + > Applying b.diff + > Applying c.diff + > Now at patch c.diff $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt @@ -49,7 +49,7 @@ Test the patch merging functionality of `quilt diff'. > -b > +b+ > c - > More recent patches modify files in b. + > More recent patches modify files in b.diff. $ quilt diff -c a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt @@ -60,7 +60,7 @@ Test the patch merging functionality of `quilt diff'. > +a+ > +b+ > c - > More recent patches modify files in b. + > More recent patches modify files in b.diff. $ quilt diff -c b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt |