tests/test-diff-unified.out
author Greg Onufer <gonufer@jazzhaiku.com>
Wed, 09 Dec 2009 16:56:00 -0800
branchstable
changeset 10135 9a4034b630c4
parent 7440 d2a917b27152
permissions -rw-r--r--
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.

adding a
% default context
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -2,7 +2,7 @@
 c
 a
 a
-b
+dd
 a
 a
 c
% invalid --unified
abort: diff context lines count must be an integer, not 'foo'
% --unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
 a
 a
-b
+dd
 a
 a
% diff.unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
 a
 a
-b
+dd
 a
 a
% diff.unified=2 --unified=1
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -4,3 +4,3 @@
 a
-b
+dd
 a
% invalid diff.unified
abort: diff context lines count must be an integer, not 'foo'
% test off-by-one error with diff -p
adding a
diff -r cb9a9f314b8b a
--- a/a
+++ b/a
@@ -1,0 +1,1 @@
+b
@@ -2,0 +3,1 @@ a
+c