view tests/test-merge8 @ 9907:f1ee8009fe10

i18n-sv: translated seven commands These commands has been translated: addremove, archive, backout, config, unbundle, verify, version
author Jens Bäckman <jens.backman@gmail.com>
date Sun, 22 Nov 2009 19:37:19 +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