summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quilt.changes8
-rw-r--r--test/import.test6
2 files changed, 12 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes
index 6771e19..ea9041a 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Sun Nov 2 17:59:03 CET 2008 - agruen@suse.de
+
+- From Wolfram Sang <w.sang@pengutronix.de>:
+ "The test for import did not always recreate a patches-dir
+ inside the temporary location, so it would fail if you
+ modified quilt using quilt."
+
+-------------------------------------------------------------------
Sun Nov 2 17:54:51 CET 2008 - agruen@suse.de
- Fix from Dean Roehrich <Dean.Roehrich@sun.com> for Solaris:
diff --git a/test/import.test b/test/import.test
index d093d2d..cebbe3b 100644
--- a/test/import.test
+++ b/test/import.test
@@ -229,7 +229,8 @@
> No patches applied
# Test importing multiple patches at once
- $ rm -rf .pc patches
+ $ rm -rf patches/ .pc/
+ $ mkdir patches
$ quilt import t/patch1.diff t/patchR.diff
> Importing patch t/patch1.diff (stored as patches/patch1.diff)
> Importing patch t/patchR.diff (stored as patches/patchR.diff)
@@ -238,7 +239,8 @@
> patch1.diff
> patchR.diff
- $ rm -rf .pc patches
+ $ rm -rf patches/ .pc/
+ $ mkdir patches
$ quilt import t/patchR.diff
> Importing patch t/patchR.diff (stored as patches/patchR.diff)
$ quilt import t/patch1.diff