view tests/test-merge8 @ 11692:52e4ac3e63f7 stable

tag: do not allow tag names to consist solely of whitespace (issue2307) (simplification and test by mpm)
author Benjamin Pollack <benjamin@bitquabit.com>
date Tue, 27 Jul 2010 14:40:25 -0400
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