mercurial-crew-with-dirclash: tests/test-586@11cf78983961

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-586

author	Thomas Arendsen Hein <thomas@intevation.de>
	Thu, 14 Jun 2007 12:54:06 +0200
changeset 4583	11cf78983961
parent 4536	720ae5085ee3
permissions	-rwxr-xr-x

Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again. Repainted the bikeshed with its original color.


#!/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

mercurial-crew-with-dirclash

RSS Atom