Mercurial > hg

diff tests/test-patch-offset.out @ 10135:9a4034b630c4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-patch-offset.out	Wed Dec 09 16:56:00 2009 -0800
@@ -0,0 +1,10 @@
+% prepare repo
+adding a
+% import patch
+applying patch from stdin
+patching file a
+Hunk #1 succeeded at 43 (offset 34 lines).
+Hunk #2 succeeded at 87 (offset 34 lines).
+Hunk #3 succeeded at 109 (offset 34 lines).
+a
+% compare imported changes against reference file