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 t

     4

cd t

     5

hg branches

     6

     7

echo foo > a

     8

hg add a

     9

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

    10

hg branch foo

    11

hg branch

    12

hg ci -m "add branch name" -d "1000000 0"

    13

hg branch bar

    14

hg ci -m "change branch name" -d "1000000 0"

    15

echo % branch shadowing

    16

hg branch default

    17

hg branch -f default

    18

hg ci -m "clear branch name" -d "1000000 0"

    19

    20

hg co foo

    21

hg branch

    22

echo bleah > a

    23

hg ci -m "modify a branch" -d "1000000 0"

    24

    25

hg merge

    26

hg branch

    27

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

    28

hg log

    29

    30

hg branches

    31

hg branches -q

    32

    33

echo % test for invalid branch cache

    34

hg rollback

    35

cp .hg/branch.cache .hg/bc-invalid

    36

hg log -r foo

    37

cp .hg/bc-invalid .hg/branch.cache

    38

hg --debug log -r foo

    39

rm .hg/branch.cache

    40

echo corrupted > .hg/branch.cache

    41

hg log -qr foo

    42

cat .hg/branch.cache

    43

    44

echo % update with no arguments: tipmost revision of the current branch

    45

hg up -q -C 0

    46

hg up -q

    47

hg id

    48

hg up -q 1

    49

hg up -q

    50

hg id

    51

hg branch foobar

    52

hg up

    53

    54

exit 0