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

#!/bin/sh

     2

     3

hg init

     4

echo a > a

     5

hg commit -A -ma

     6

     7

echo a >> a

     8

hg commit -mb

     9

    10

echo a >> a

    11

hg commit -mc

    12

    13

hg up 1

    14

echo a >> a

    15

hg commit -md

    16

    17

hg up 1

    18

echo a >> a

    19

hg commit -me

    20

    21

hg up 1

    22

echo % should fail because not at a head

    23

hg merge

    24

    25

hg up

    26

echo % should fail because \> 2 heads

    27

hg merge

    28

    29

echo % should succeed

    30

hg merge 2

    31

hg commit -mm1

    32

    33

echo % should succeed - 2 heads

    34

hg merge

    35

hg commit -mm2

    36

    37

echo % should fail because 1 head

    38

hg merge

    39

    40

true