Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 4912:c4dd58af0fc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue 622: pull/unbundle -u updates to default branch if repo was empty
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Jul 2007 18:01:20 -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