Mercurial > public > mercurial-scm > hg

view tests/test-copy-move-merge @ 7861:2bc14da14992

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: blacklist pythoncom win32com.shell would segfault at import time if pythoncom was demand loaded.
author Steve Borho <steve@borho.org>
date Mon, 09 Mar 2009 21:00:37 -0500
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