diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2008-11-02 16:59:47 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2008-11-02 16:59:47 +0000 |
commit | b80314d3779fb276474b5117e935bf4c5e31eef2 (patch) | |
tree | b5beb997e2a9d5d6154f07d48dc13e5201d66e31 | |
parent | 2b016e4a06ac6d1ec6c09a840b2a4c06aaa363e9 (diff) | |
download | quilt-b80314d3779fb276474b5117e935bf4c5e31eef2.tar.gz |
- 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."
-rw-r--r-- | quilt.changes | 8 | ||||
-rw-r--r-- | test/import.test | 6 |
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 |