Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 5397:11caa374f497

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osutil.c: include Python.h before the other headers This is recommended by the Python documentation, since Python.h defines some constants.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 06 Oct 2007 14:14:11 -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