tests/test-rename-dir-merge
author Matt Mackall <mpm@selenic.com>
Sun, 19 Aug 2007 14:03:56 -0500
changeset 5206 0f6a1bdf89fb
parent 3748 7b88bd88f040
child 5244 dee573ba79f1
permissions -rwxr-xr-x
match: handle large regexes Some Python versions don't handle large regexes, so when we hit an overflow, split our regex in two.

#!/bin/sh

mkdir t
cd t
hg init

mkdir a
echo foo > a/a
echo bar > a/b

hg add a
hg ci -m "0" -d "0 0"

hg co -C 0
hg mv a b
hg ci -m "1 mv a/ b/" -d "0 0"

hg co -C 0
echo baz > a/c
hg add a/c
hg ci -m "2 add a/c" -d "0 0"

hg merge --debug 1
echo a/* b/*
hg st -C
hg ci -m "3 merge 2+1" -d "0 0"

hg co -C 1
hg merge --debug 2
echo a/* b/*
hg st -C
hg ci -m "4 merge 1+2" -d "0 0"