Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 4810:f7c8222920ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: svn: defer get_log parsing until after get_log completes. According to the documentation, it is not safe to perform any other operation on the ra object until get_log completes.
author Brendan Cully <brendan@kublai.com>
date Thu, 05 Jul 2007 12:18:01 -0700
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