Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 4147:691f9168a815

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the purge extension use the statwalk walker from the dirstate object
author Emanuele Aina <faina.mail@tiscali.it>
date Tue, 06 Mar 2007 17:45:40 -0300
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