actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header

     1

% init

     2

% commit

     3

adding a

     4

% annotate -c

     5

8435f90966e4: a

     6

% annotate -d

     7

Thu Jan 01 00:00:01 1970 +0000: a

     8

% annotate -n

     9

0: a

    10

% annotate -u

    11

nobody: a

    12

% annotate -cdnu

    13

nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a

    14

% annotate b

    15

2: a

    16

2: a

    17

2: a

    18

3: b

    19

3: b

    20

3: b

    21

% annotate -nf b

    22

0 a: a

    23

1 a: a

    24

1 a: a

    25

3 b: b

    26

3 b: b

    27

3 b: b

    28

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    29

merging b

    30

0 files updated, 1 files merged, 0 files removed, 0 files unresolved

    31

(branch merge, don't forget to commit)

    32

% annotate after merge

    33

0 a: a

    34

1 a: a

    35

1 a: a

    36

3 b: b

    37

4 b: c

    38

3 b: b

    39

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    40

merging b

    41

0 files updated, 1 files merged, 0 files removed, 0 files unresolved

    42

(branch merge, don't forget to commit)

    43

% annotate after rename merge

    44

0 a: a

    45

6 b: z

    46

1 a: a

    47

3 b: b

    48

4 b: c

    49

3 b: b

    50

7 b: d

    51

% linkrev vs rev

    52

0: a

    53

1: a

    54

1: a