equal
deleted
inserted
replaced
|
1 From: Wolfram Sang <[email protected]> |
|
2 Subject: [Quilt-dev] [patch 2/3] import.test: always have a local patches-dir |
|
3 Date: Sat, 11 Oct 2008 15:47:22 +0200 |
|
4 To: [email protected] |
|
5 cc: |
|
6 |
|
7 The test for import did not always recreate a patches-dir inside the temporary |
|
8 location, so it would fail if you modified quilt using quilt. |
|
9 |
|
10 Signed-off-by: Wolfram Sang <[email protected]> |
|
11 --- |
|
12 test/import.test | 6 ++++-- |
|
13 1 file changed, 4 insertions(+), 2 deletions(-) |
|
14 |
|
15 Index: test/import.test |
|
16 =================================================================== |
|
17 --- test/import.test.orig 2008-11-05 14:14:37.911126000 -0600 |
|
18 +++ test/import.test 2008-11-05 14:14:41.151317000 -0600 |
|
19 @@ -229,7 +229,8 @@ |
|
20 > No patches applied |
|
21 |
|
22 # Test importing multiple patches at once |
|
23 - $ rm -rf .pc patches |
|
24 + $ rm -rf patches/ .pc/ |
|
25 + $ mkdir patches |
|
26 $ quilt import t/patch1.diff t/patchR.diff |
|
27 > Importing patch t/patch1.diff (stored as patches/patch1.diff) |
|
28 > Importing patch t/patchR.diff (stored as patches/patchR.diff) |
|
29 @@ -238,7 +239,8 @@ |
|
30 > patch1.diff |
|
31 > patchR.diff |
|
32 |
|
33 - $ rm -rf .pc patches |
|
34 + $ rm -rf patches/ .pc/ |
|
35 + $ mkdir patches |
|
36 $ quilt import t/patchR.diff |
|
37 > Importing patch t/patchR.diff (stored as patches/patchR.diff) |
|
38 $ quilt import t/patch1.diff |