tests/test-simple-update
author Matt Mackall <mpm@selenic.com>
Fri, 17 Feb 2006 17:23:53 -0600
changeset 1716 ef8cd889a78b
parent 814 0902ffece4b4
child 3736 ad3d5b4367cb
permissions -rwxr-xr-x
Refactor excessive merge detection, add test

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