equal
deleted
inserted
replaced
|
1 |
|
2 $ cat > writepatterns.py <<EOF |
|
3 > import sys |
|
4 > |
|
5 > path = sys.argv[1] |
|
6 > patterns = sys.argv[2:] |
|
7 > |
|
8 > fp = file(path, 'wb') |
|
9 > for pattern in patterns: |
|
10 > count = int(pattern[0:-1]) |
|
11 > char = pattern[-1] + '\n' |
|
12 > fp.write(char*count) |
|
13 > fp.close() |
|
14 > EOF |
|
15 |
|
16 prepare repo |
|
17 |
|
18 $ hg init a |
|
19 $ cd a |
|
20 |
|
21 These initial lines of Xs were not in the original file used to generate |
|
22 the patch. So all the patch hunks need to be applied to a constant offset |
|
23 within this file. If the offset isn't tracked then the hunks can be |
|
24 applied to the wrong lines of this file. |
|
25 |
|
26 $ python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A |
|
27 $ hg commit -Am adda |
|
28 adding a |
|
29 |
|
30 This is a cleaner patch generated via diff |
|
31 In this case it reproduces the problem when |
|
32 the output of hg export does not |
|
33 import patch |
|
34 |
|
35 $ hg import -v -m 'b' -d '2 0' - <<EOF |
|
36 > --- a/a 2009-12-08 19:26:17.000000000 -0800 |
|
37 > +++ b/a 2009-12-08 19:26:17.000000000 -0800 |
|
38 > @@ -9,7 +9,7 @@ |
|
39 > A |
|
40 > A |
|
41 > B |
|
42 > -A |
|
43 > +a |
|
44 > A |
|
45 > A |
|
46 > A |
|
47 > @@ -53,7 +53,7 @@ |
|
48 > A |
|
49 > A |
|
50 > B |
|
51 > -A |
|
52 > +a |
|
53 > A |
|
54 > A |
|
55 > A |
|
56 > @@ -75,7 +75,7 @@ |
|
57 > A |
|
58 > A |
|
59 > B |
|
60 > -A |
|
61 > +a |
|
62 > A |
|
63 > A |
|
64 > A |
|
65 > EOF |
|
66 applying patch from stdin |
|
67 patching file a |
|
68 Hunk #1 succeeded at 43 (offset 34 lines). |
|
69 Hunk #2 succeeded at 87 (offset 34 lines). |
|
70 Hunk #3 succeeded at 109 (offset 34 lines). |
|
71 a |
|
72 |
|
73 compare imported changes against reference file |
|
74 |
|
75 $ python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A |
|
76 $ diff aref a |