Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 4584:0d26e3d0eeeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make parents with a file but not a revision use working directory revision.
author Brendan Cully <brendan@kublai.com>
date Thu, 14 Jun 2007 10:58:49 -0700
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