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

echo % init foo-base

     4

hg init foo-base

     5

     6

echo % create alpha in first repo

     7

cd foo-base

     8

echo 'alpha' > alpha

     9

hg ci -A -m 'add alpha' -d '1 0'

    10

cd ..

    11

    12

echo % clone foo-base to foo-work

    13

hg clone foo-base foo-work

    14

    15

echo % create beta in second repo

    16

cd foo-work

    17

echo 'beta' > beta

    18

hg ci -A -m 'add beta' -d '2 0'

    19

cd ..

    20

    21

echo % create gamma in first repo

    22

cd foo-base

    23

echo 'gamma' > gamma

    24

hg ci -A -m 'add gamma' -d '3 0'

    25

cd ..

    26

    27

echo % pull into work and merge

    28

cd foo-work

    29

hg pull -q

    30

hg merge

    31

    32

echo % revert to changeset 1 to simulate a failed merge

    33

rm alpha beta gamma

    34

hg up -C 1