view tests/test-merge8 @ 4391:722417b3d7fa

Add hgwebdir.fcgi to contrib
author Michael Gebetsroither <michael.geb@gmx.at>
date Sun, 29 Apr 2007 18:17:35 -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