tests/test-merge8
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Fri, 02 Jul 2010 15:05:21 +0900
branchstable
changeset 11544 be5e86c80628
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
hg.clone: fix branch value when passing a repo object (issue2267) Since 3d6915f5a2bb the branch argument for addbranchrevs should be a tuple: (hashbranch, branches) The right empty value therefore is (None, []) instead of None.

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