Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 4899:1b7bbc4349e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch.py: don't mark files as changed unless they have actually been changed
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 17 Jul 2007 09:39:30 -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