tests/test-simple-update
author mpm@selenic.com
Sat, 23 Jul 2005 10:00:56 -0500
changeset 768 20e95c245bc3
parent 749 7e4843b7efd2
child 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rwxr-xr-x
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH

#!/bin/sh

set -ex

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m "1"
hg verify

hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -m "2"

cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest