Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 4904:59b8ff35c4ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: patches should be read and written in binary mode when possible.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 17 Jul 2007 23:35:24 +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