Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 5069:35f67dd712d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: svn: ensure leading / is removed from paths in _find_children (broken in 2bd996d0aaf8)
author Brendan Cully <brendan@kublai.com>
date Sat, 04 Aug 2007 18:02:37 -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