view tests/test-merge8 @ 10081:a5f3f9b1c42a

test-rollback: Ignore hook exit code Failing hooks returned 255 on Solaris
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 16 Dec 2009 12:10:21 +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