Mercurial > hg
comparison tests/test-patch-offset.out @ 10135:9a4034b630c4 stable
patch: better handling of sequence of offset patch hunks (issue1941)
The built-in patch implementation applied the hunks to the wrong lines of the
file if the file in the repo has been modified to skew the patch line numbers
and the file contains repetitive sequences of lines.
| author | Greg Onufer <gonufer@jazzhaiku.com> |
|---|---|
| date | Wed, 09 Dec 2009 16:56:00 -0800 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 10132:ebf69364e80f | 10135:9a4034b630c4 |
|---|---|
| 1 % prepare repo | |
| 2 adding a | |
| 3 % import patch | |
| 4 applying patch from stdin | |
| 5 patching file a | |
| 6 Hunk #1 succeeded at 43 (offset 34 lines). | |
| 7 Hunk #2 succeeded at 87 (offset 34 lines). | |
| 8 Hunk #3 succeeded at 109 (offset 34 lines). | |
| 9 a | |
| 10 % compare imported changes against reference file |