Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-586 @ 4576:eb3b7dd1e158

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: reduce matcher abuse The match function should match only the files we're interested in.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 13 Jun 2007 21:39:45 -0300
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