diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-01-10 18:38:54 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2006-01-10 18:38:54 +0000 |
| commit | c31c2b03f9cb66981908c9048eb586d2917856af (patch) | |
| tree | c473f794127b8ce789c0b65a4acdfdd7d613fbec /test/merge.test | |
| parent | 24dc4930b6456c12bcbdf41173cc52637b88fcd5 (diff) | |
| download | quilt-c31c2b03f9cb66981908c9048eb586d2917856af.tar.gz | |
- test/null-bug.test: Fix the original directory creation so that
the test doesn't fail if any higher-level directory contains a
patches/ sub-directory.
- test/*.test: Fix the test suite after the December 8th, 2005
change to quilt diff. Contributed by Markus Oberhumer.
Diffstat (limited to 'test/merge.test')
| -rw-r--r-- | test/merge.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/merge.test b/test/merge.test index b50495d..a3fa679 100644 --- a/test/merge.test +++ b/test/merge.test @@ -42,7 +42,7 @@ Test the patch merging functionality of `quilt diff'. > Now at patch %{P}c.diff $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" - > More recent patches modify files in patch %{P}b.diff + > Warning: more recent patches modify files in patch %{P}b.diff > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -52,7 +52,7 @@ Test the patch merging functionality of `quilt diff'. > c $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" - > More recent patches modify files in patch %{P}b.diff + > Warning: more recent patches modify files in patch %{P}b.diff > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ |