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 test

     4

cd test

     5

cat >>afile <<EOF

     6

0

     7

EOF

     8

hg add afile

     9

hg commit -m "0.0"

    10

cat >>afile <<EOF

    11

1

    12

EOF

    13

hg commit -m "0.1"

    14

cat >>afile <<EOF

    15

2

    16

EOF

    17

hg commit -m "0.2"

    18

cat >>afile <<EOF

    19

3

    20

EOF

    21

hg commit -m "0.3"

    22

hg update -C 0

    23

cat >>afile <<EOF

    24

1

    25

EOF

    26

hg commit -m "1.1"

    27

cat >>afile <<EOF

    28

2

    29

EOF

    30

hg commit -m "1.2"

    31

cat >fred <<EOF

    32

a line

    33

EOF

    34

cat >>afile <<EOF

    35

3

    36

EOF

    37

hg add fred

    38

hg commit -m "1.3"

    39

hg mv afile adifferentfile

    40

hg commit -m "1.3m"

    41

hg update -C 3

    42

hg mv afile anotherfile

    43

hg commit -m "0.3m"

    44

hg debugindex .hg/store/data/afile.i

    45

hg debugindex .hg/store/data/adifferentfile.i

    46

hg debugindex .hg/store/data/anotherfile.i

    47

hg debugindex .hg/store/data/fred.i

    48

hg debugindex .hg/store/00manifest.i

    49

hg verify

    50

cd ..

    51

for i in 0 1 2 3 4 5 6 7 8; do

    52

   mkdir test-"$i"

    53

   hg --cwd test-"$i" init

    54

   hg -R test push -r "$i" test-"$i"

    55

   cd test-"$i"

    56

   hg verify

    57

   cd ..

    58

done

    59

cd test-8

    60

hg pull ../test-7

    61

hg verify