Mercurial > hg

view tests/test-586 @ 4722:487943b52a6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: regularize patch header creation. Do not prefix qnew patches with [mq]: when a message has been given. Always use [mq]: as the prefix for generated commit messages.
author Brendan Cully <brendan@kublai.com>
date Mon, 25 Jun 2007 15:57:01 -0700
parents 720ae5085ee3
children f1af59451c0c
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