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

# should show copy

     2

copy: foo -> bar

     3

# shouldn't show copy

     4

# should match

     5

   rev    offset  length   base linkrev nodeid       p1           p2

     6

     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000

     7

bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd

     8

# should not be renamed

     9

bar not renamed

    10

# should show copy

    11

copy: foo -> bar

    12

# should show no parents for tip

    13

   rev    offset  length   base linkrev nodeid       p1           p2

    14

     0         0      69      0       1 6ca237634e1f 000000000000 000000000000

    15

     1        69       6      1       2 7a1ff8e75f5b 6ca237634e1f 000000000000

    16

     2        75      82      1       3 243dfe60f3d9 000000000000 000000000000

    17

# should match

    18

   rev    offset  length   base linkrev nodeid       p1           p2

    19

     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000

    20

     1         5       7      1       2 dd12c926cf16 2ed2a3912a0b 000000000000

    21

bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17

    22

# should show no copies