tests/test-merge8
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Wed, 08 Apr 2009 14:18:20 +0200
changeset 8021 1c2cf2e5dc9b
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
profiling: dropping hotshot profiling. --profile as a unique profiling option hotshot was an experimental module, which is broken for Python < 2.5 And even for Python >= 2.5 users, hotshot usage is discouraged: cProfile (formerly lsprof) should be used instead.

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