view tests/test-merge8 @ 8281:3e1e499db9d7

util: initialize md5 and sha1 without using extra global variables This lets the functions skip the "if _sha1 is None" test on each call.
author Martin Geisler <mg@lazybytes.net>
date Sun, 03 May 2009 00:03:35 +0200
parents efbe24c7d8d9
children
line wrap: on
line source

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update