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

#  A          B    

     4

#  

     5

#  3  4       3    

     6

#  |\/|       |\   

     7

#  |/\|       | \  

     8

#  1  2       1  2 

     9

#  \ /        \ /  

    10

#   0          0

    11

#

    12

# if the result of the merge of 1 and 2

    13

# is the same in 3 and 4, no new manifest

    14

# will be created and the manifest group

    15

# will be empty during the pull

    16

#

    17

# (plus we test a failure where outgoing

    18

# wrongly reported the number of csets)

    19

#

    20

    21

hg init a

    22

cd a

    23

touch init

    24

hg ci -A -m 0 -d "1000000 0"

    25

touch x y

    26

hg ci -A -m 1 -d "1000000 0"

    27

hg update 0

    28

touch x y

    29

hg ci -A -m 2 -d "1000000 0"

    30

hg merge 1

    31

hg ci -A -m m1 -d "1000000 0"

    32

#hg log

    33

#hg debugindex .hg/store/00manifest.i

    34

hg update -C 1

    35

hg merge 2

    36

hg ci -A -m m2 -d "1000000 0"

    37

#hg log

    38

#hg debugindex .hg/store/00manifest.i

    39

    40

cd ..

    41

hg clone -r 3 a b

    42

hg clone -r 4 a c

    43

hg -R a outgoing b

    44

hg -R a outgoing c

    45

hg -R b outgoing c

    46

hg -R c outgoing b

    47

    48

hg -R b pull a

    49

hg -R c pull a