Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-copy-move-merge @ 5069:35f67dd712d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: svn: ensure leading / is removed from paths in _find_children (broken in 2bd996d0aaf8)
author Brendan Cully <brendan@kublai.com>
date Sat, 04 Aug 2007 18:02:37 -0700
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