tests/test-diff-unified.out
author Tobias Bell <tobias.bell@gmail.com>
Fri, 03 Apr 2009 22:35:07 +0200
changeset 7964 4946ecb3c6fa
parent 7440 d2a917b27152
permissions -rw-r--r--
i18n-de: translated archival.py, bundlerepo.py, changegroup.py and changelog.py
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6467
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     1
adding a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     2
% default context
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     3
diff -r cf9f4ba66af2 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     4
--- a/a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     5
+++ b/a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     6
@@ -2,7 +2,7 @@
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     7
 c
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     8
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     9
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    10
-b
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    11
+dd
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    12
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    13
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    14
 c
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    15
% invalid --unified
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    16
abort: diff context lines count must be an integer, not 'foo'
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    17
% --unified=2
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    18
diff -r cf9f4ba66af2 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    19
--- a/a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    20
+++ b/a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    21
@@ -3,5 +3,5 @@
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    22
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    23
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    24
-b
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    25
+dd
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    26
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    27
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    28
% diff.unified=2
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    29
diff -r cf9f4ba66af2 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    30
--- a/a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    31
+++ b/a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    32
@@ -3,5 +3,5 @@
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    33
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    34
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    35
-b
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    36
+dd
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    37
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    38
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    39
% diff.unified=2 --unified=1
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    40
diff -r cf9f4ba66af2 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    41
--- a/a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    42
+++ b/a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    43
@@ -4,3 +4,3 @@
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    44
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    45
-b
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    46
+dd
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    47
 a
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    48
% invalid diff.unified
65029a3aafc2 Let --unified default to diff.unified (issue 1076)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    49
abort: diff context lines count must be an integer, not 'foo'
7437
3cdaac732b2b tests: fix test results for 07faba78cf5a
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6467
diff changeset
    50
% test off-by-one error with diff -p
3cdaac732b2b tests: fix test results for 07faba78cf5a
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6467
diff changeset
    51
adding a
3cdaac732b2b tests: fix test results for 07faba78cf5a
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6467
diff changeset
    52
diff -r cb9a9f314b8b a
7440
d2a917b27152 Fix test breakage introduced in 07faba78cf5a
Brendan Cully <brendan@kublai.com>
parents: 7437
diff changeset
    53
--- a/a
d2a917b27152 Fix test breakage introduced in 07faba78cf5a
Brendan Cully <brendan@kublai.com>
parents: 7437
diff changeset
    54
+++ b/a
7437
3cdaac732b2b tests: fix test results for 07faba78cf5a
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6467
diff changeset
    55
@@ -1,0 +1,1 @@
3cdaac732b2b tests: fix test results for 07faba78cf5a
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6467
diff changeset
    56
+b
3cdaac732b2b tests: fix test results for 07faba78cf5a
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6467
diff changeset
    57
@@ -2,0 +3,1 @@ a
3cdaac732b2b tests: fix test results for 07faba78cf5a
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6467
diff changeset
    58
+c