diff options
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 |