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

# Test issue 529 - mq aborts when merging patch deleting files

     4

     5

rewrite_path()

     6

{

     7

    sed -e 's:\\:/:g' -e 's:[^ ]*/t/::g'

     8

}

     9

    10

echo "[extensions]" >> $HGRCPATH

    11

echo "hgext.mq=" >> $HGRCPATH

    12

    13

# Commit two dummy files in "init" changeset

    14

hg init t

    15

cd t

    16

echo a > a

    17

echo b > b

    18

hg ci -Am init

    19

hg tag -l init

    20

    21

# Create a patch removing a

    22

hg qnew rm_a

    23

hg rm a

    24

hg qrefresh -m "rm a"

    25

    26

# Save the patch queue so we can merge it later

    27

hg qsave -c -e 2>&1 | rewrite_path

    28

    29

# Update b and commit in an "update" changeset

    30

hg up -C init

    31

echo b >> b

    32

hg st

    33

hg ci -m update

    34

    35

# Here, qpush used to abort with :

    36

# The system cannot find the file specified => a

    37

hg manifest

    38

hg qpush -a -m 2>&1 | rewrite_path

    39

hg manifest