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

mkdir t

     4

cd t

     5

hg init

     6

echo "added file1" > file1

     7

echo "added file2" > file2

     8

hg add file1 file2

     9

hg commit -m "added file1 and file2" -d "1000000 0" -u user

    10

echo "changed file1" >> file1

    11

hg commit -m "changed file1" -d "1000000 0" -u user

    12

hg -q log

    13

hg id

    14

hg update -C 0

    15

hg id

    16

echo "changed file1" >> file1

    17

hg id

    18

hg revert --all

    19

hg diff

    20

hg status

    21

hg id

    22

hg update

    23

hg diff

    24

hg status

    25

hg id

    26

hg update -C 0

    27

echo "changed file1" >> file1

    28

HGMERGE=merge hg update

    29

hg diff

    30

hg status

    31

hg id

    32

hg revert --all

    33

hg diff

    34

hg status

    35

hg id

    36

hg revert -r tip --all

    37

hg diff

    38

hg status

    39

hg id

    40

hg update -C

    41

hg diff

    42

hg status

    43

hg id

    44