tests/test-simple-update
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 06 Feb 2007 15:54:58 -0200
changeset 4065 8ee983e3d461
parent 3736 ad3d5b4367cb
permissions -rwxr-xr-x
fix strip'ping the second parent of a merge

#!/bin/sh

set -e

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 --debug