equal
deleted
inserted
replaced
21 These initial lines of Xs were not in the original file used to generate |
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 |
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 |
23 within this file. If the offset isn't tracked then the hunks can be |
24 applied to the wrong lines of this file. |
24 applied to the wrong lines of this file. |
25 |
25 |
26 $ $PYTHON ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A |
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 |
27 $ hg commit -Am adda |
28 adding a |
28 adding a |
29 |
29 |
30 This is a cleaner patch generated via diff |
30 This is a cleaner patch generated via diff |
31 In this case it reproduces the problem when |
31 In this case it reproduces the problem when |
74 committing changelog |
74 committing changelog |
75 created 189885cecb41 |
75 created 189885cecb41 |
76 |
76 |
77 compare imported changes against reference file |
77 compare imported changes against reference file |
78 |
78 |
79 $ $PYTHON ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A |
79 $ "$PYTHON" ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A |
80 $ diff aref a |
80 $ diff aref a |
81 |
81 |
82 $ cd .. |
82 $ cd .. |