view tests/test-unrelated-pull @ 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

mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -m "a" -u a -d "0 0"

cd ..
mkdir b
cd b
hg init 
echo 321 > b
hg add b
hg commit -m "b" -u b -d "0 0"

hg pull ../a
hg heads