view tests/test-copy-move-merge @ 8522:39fd67552297

match: use self.exact instead of lambda self.exact uses a set and does not need an extra copy of the files
author Simon Heimberg <simohe@besonet.ch>
date Fri, 15 May 2009 09:43:30 +0200
parents 8d9bdcbb2b18
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init

echo 1 > a
hg ci -qAm "first" -d "1000000 0"

hg cp a b
hg mv a c
echo 2 >> b
echo 2 >> c

hg ci -qAm "second" -d "1000000 0"

hg co -C 0

echo 0 > a
echo 1 >> a

hg ci -qAm "other" -d "1000000 0"

hg merge --debug

echo "-- b --"
cat b

echo "-- c --"
cat c