diff options
Diffstat (limited to 'test/merge.test')
| -rw-r--r-- | test/merge.test | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/test/merge.test b/test/merge.test index a3fa679..c64b33d 100644 --- a/test/merge.test +++ b/test/merge.test @@ -1,8 +1,6 @@ Test the patch merging functionality of `quilt diff'. - $ rm -rf d - $ mkdir -p d/patches - $ cd d + $ mkdir patches $ cat > abc.txt < a @@ -43,7 +41,7 @@ Test the patch merging functionality of `quilt diff'. $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" > Warning: more recent patches modify files in patch %{P}b.diff - > Index: d/abc.txt + >~ Index: [^/]+/abc\.txt > =================================================================== > @@ -1,3 +1,3 @@ > a+ @@ -53,7 +51,7 @@ Test the patch merging functionality of `quilt diff'. $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" > Warning: more recent patches modify files in patch %{P}b.diff - > Index: d/abc.txt + >~ Index: [^/]+/abc\.txt > =================================================================== > @@ -1,3 +1,3 @@ > -a @@ -63,7 +61,7 @@ Test the patch merging functionality of `quilt diff'. > c $ quilt diff --combine b.diff | grep -v "^\\(---\\|+++\\)" - > Index: d/abc.txt + >~ Index: [^/]+/abc\.txt > =================================================================== > @@ -1,3 +1,3 @@ > a+ @@ -73,7 +71,7 @@ Test the patch merging functionality of `quilt diff'. > +c+ $ quilt diff --combine - | grep -v "^\\(---\\|+++\\)" - > Index: d/abc.txt + >~ Index: [^/]+/abc\.txt > =================================================================== > @@ -1,3 +1,3 @@ > -a @@ -82,6 +80,3 @@ Test the patch merging functionality of `quilt diff'. > +a+ > +b+ > +c+ - - $ cd .. - $ rm -rf d |