Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-586
author Patrick Mezard <pmezard@gmail.com>
Sat, 06 Oct 2007 22:30:22 +0200
changeset 5405 8feb33c2d153
parent 4536 720ae5085ee3
permissions -rwxr-xr-x
Display symlink or executable bit with manifest -v New output looks like: 644 a 755 * b/a 644 @ l

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