Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 4781:62c56d8f368b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix revlog.children so the real children of the null revision can be calculated.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 03 Jul 2007 12:45:33 +0200
parents 93a4e72b4f83
children
line wrap: on
line source

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status