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

adding foo

     2

checking changesets

     3

checking manifests

     4

crosschecking files in changesets and manifests

     5

checking files

     6

1 files, 1 changesets, 1 total revisions

     7

requesting all changes

     8

adding changesets

     9

adding manifests

    10

adding file changes

    11

added 1 changesets with 1 changes to 1 files

    12

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    13

checking changesets

    14

checking manifests

    15

crosschecking files in changesets and manifests

    16

checking files

    17

1 files, 1 changesets, 1 total revisions

    18

0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    19

foo

    20

2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo

    21

pulling from http://localhost:20059/

    22

searching for changes

    23

no changes found