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

--

     2

A dir/b.o

     3

? a.c

     4

? a.o

     5

? dir/c.o

     6

? syntax

     7

--

     8

abort: .hgignore: invalid pattern (relre): *.o

     9

--

    10

A dir/b.o

    11

? .hgignore

    12

? a.c

    13

? syntax

    14

--

    15

.hgignore: ignoring invalid syntax 'invalid'

    16

A dir/b.o

    17

? .hgignore

    18

? a.c

    19

? a.o

    20

? dir/c.o

    21

? syntax

    22

--

    23

A dir/b.o

    24

? .hgignore

    25

? a.c

    26

? syntax

    27

--

    28

A dir/b.o

    29

? .hgignore

    30

? a.c

    31

? a.o

    32

? dir/c.o

    33

--

    34

A dir/b.o

    35

--

    36

A b.o