tests/test-rename-dir-merge2
author Mads Kiilerich <mads@kiilerich.com>
Tue, 14 Oct 2008 21:28:49 +0200
changeset 7226 b71a52f101dc
parent 4115 c95060a5391a
permissions -rwxr-xr-x
Make it possible to disable filtering for a pattern. Rationale: Apparently there were no way to disable for example win32text extension locally. RFC: Can it already be done another way?

#!/bin/sh

mkdir r1
cd r1
hg init
mkdir a
echo foo > a/f
hg add a
hg ci -m "a/f == foo"
cd ..

hg clone r1 r2
cd r2
hg mv a b
echo foo1 > b/f
hg ci -m" a -> b, b/f == foo1"
cd ..

cd r1
mkdir a/aa
echo bar > a/aa/g
hg add a/aa
hg ci -m "a/aa/g"
hg pull ../r2

hg merge

hg st -C