diff options
| -rw-r--r-- | quilt.changes | 9 | ||||
| -rw-r--r-- | test/merge.test | 4 | ||||
| -rw-r--r-- | test/null-bug.test | 3 | ||||
| -rw-r--r-- | test/one.test | 2 | ||||
| -rw-r--r-- | test/two.test | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/quilt.changes b/quilt.changes index ef0e846..b5680a4 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Jan 10 19:29:57 CET 2006 - khali@linux-fr.org + +- 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. + +------------------------------------------------------------------- Wed Jan 4 17:32:47 CET 2006 - khali@linux-fr.org - po/quilt.pot, po/de.po: Resync with code. 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 @@ diff --git a/test/null-bug.test b/test/null-bug.test index b8ad46e..cd7e3a6 100644 --- a/test/null-bug.test +++ b/test/null-bug.test @@ -1,4 +1,5 @@ - $ mkdir d + $ rm -rf d + $ mkdir -p d/patches $ cd d $ echo file > file diff --git a/test/one.test b/test/one.test index de9c2d9..70764cb 100644 --- a/test/one.test +++ b/test/one.test @@ -133,7 +133,7 @@ of the installed quilt with `make check'. > @@ -1 +1,2 @@ > This is file two. > +Another line added. - > More recent patches modify files in patch %{P}patch1.diff + > Warning: more recent patches modify files in patch %{P}patch1.diff $ quilt refresh patch1 > More recent patches modify files in patch %{P}patch1.diff. Enforce refresh with -f. diff --git a/test/two.test b/test/two.test index 9d823b7..bb7a0b7 100644 --- a/test/two.test +++ b/test/two.test @@ -136,7 +136,7 @@ > @@ -1 +1,2 @@ > This is file two. > +Another line added. - > More recent patches modify files in patch %{_P}patch1.diff + > Warning: more recent patches modify files in patch %{_P}patch1.diff $ quilt refresh patch1 > More recent patches modify files in patch %{_P}patch1.diff. Enforce refresh with -f. |