view tests/test-simple-update @ 768:20e95c245bc3

Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH
author mpm@selenic.com
date Sat, 23 Jul 2005 10:00:56 -0500
parents 7e4843b7efd2
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
line wrap: on
line source

#!/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