Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 4076:5a89c61c189c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch CGI stdout to binary on windows Problem diagnosed by Andrei Vermel.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 13 Feb 2007 06:50:00 -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