summaryrefslogtreecommitdiffstats
path: root/test/two.test
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-01-10 18:38:54 +0000
committerJean Delvare <khali@linux-fr.org>2006-01-10 18:38:54 +0000
commitc31c2b03f9cb66981908c9048eb586d2917856af (patch)
treec473f794127b8ce789c0b65a4acdfdd7d613fbec /test/two.test
parent24dc4930b6456c12bcbdf41173cc52637b88fcd5 (diff)
downloadquilt-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/two.test')
-rw-r--r--test/two.test2
1 files changed, 1 insertions, 1 deletions
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.