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

# Corrupt an hg repo with two pulls.

     4

#

     5

     6

# create one repo with a long history

     7

hg init source1

     8

cd source1

     9

touch foo

    10

hg add foo

    11

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

    12

    echo $i >> foo

    13

    hg ci -m $i

    14

done

    15

cd ..

    16

    17

# create one repo with a shorter history

    18

hg clone -r 0 source1 source2

    19

cd source2

    20

echo a >> foo

    21

hg ci -m a

    22

cd ..

    23

    24

# create a third repo to pull both other repos into it

    25

hg init corrupted

    26

cd corrupted

    27

# use a hook to make the second pull start while the first one is still running

    28

echo '[hooks]' >> .hg/hgrc

    29

echo 'prechangegroup = sleep 5' >> .hg/hgrc

    30

    31

# start a pull...

    32

hg pull ../source1 &

    33

    34

# ... and start another pull before the first one has finished

    35

sleep 1

    36

hg pull ../source2 2>/dev/null

    37

    38

# see the result

    39

wait

    40

hg verify

    41