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