view tests/test-merge8 @ 7525:6a49fa7674c1

hgweb: mq repos should be in non-recursive collections, too
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 19 Dec 2008 18:24:49 +0100
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