diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2004-07-09 07:26:21 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2004-07-09 07:26:21 +0000 |
| commit | e7bb642fdbcfa9bb1d7265781f56d89e398f90b9 (patch) | |
| tree | 1ad9d16ce37e504ba72f9315c94ca9eb95597133 /test/merge.test | |
| parent | c871d820f8f00819613068aa77cb00d89e4508af (diff) | |
| download | quilt-e7bb642fdbcfa9bb1d7265781f56d89e398f90b9.tar.gz | |
- Switch from echo to printf for all translations: This is more
stable than having expansions in messages that might change
independent of the message.
- Add print_patch function and always use it when printing patch
names. Remove -n options from various scripts and use a global
switch QUILT_PATCHES_PREFIX in .quiltrc to decide between patch
names with and without directory prefix. Depending on user
experience this switch may eventually go away.
- Add --diffstat option to refresh command: If given, this option
inserts diffstat statistics at the end of the patch header, or
refreshes the existing diffstat output. No special tags in the
path file (%diffstat or the like) are needed.
- Minor fix inserting changelog into RPM specfile.
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 21799cd..aaa9da8 100644 --- a/test/merge.test +++ b/test/merge.test @@ -36,12 +36,13 @@ Test the patch merging functionality of `quilt diff'. < +c+ $ quilt push -qa - > Applying a.diff - > Applying b.diff - > Applying c.diff - > Now at patch c.diff + > Applying patch %{P}a.diff + > Applying patch %{P}b.diff + > Applying patch %{P}c.diff + > Now at patch %{P}c.diff $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" + > More recent patches modify files in patch %{P}b.diff > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -49,9 +50,9 @@ Test the patch merging functionality of `quilt diff'. > -b > +b+ > c - > More recent patches modify files in b.diff. $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" + > More recent patches modify files in patch %{P}b.diff > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -60,7 +61,6 @@ Test the patch merging functionality of `quilt diff'. > +a+ > +b+ > c - > More recent patches modify files in b.diff. $ quilt diff --combine b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt |