tests/test-merge8
author Eric Hopper <hopper@omnifarious.org>
Thu, 21 Jun 2007 10:40:09 -0700
changeset 4675 6858a7477a5e
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Change branches to sort 'active' branches first, and add an option to show only active branches.

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