Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 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 720ae5085ee3
children
line wrap: on
line source

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A