Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 5480:5223c360503e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: fix traceback when diffstat isn't available
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 26 Oct 2007 12:01:14 +0200
parents efbe24c7d8d9
children
line wrap: on
line source

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update