tests/test-branch
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 12:16:02 -0700
changeset 4418 0532491f7476
parent 3068 547d1a4aa105
permissions -rwxr-xr-x
MQ: tidy up if a qpush is interrupted. This aborts the transaction, makes sure the dirtied dirstate isn't written out, and cleans up the working directory.

#!/bin/sh
#
# test for branch handling
#
# XXX: need more tests

hg init
echo a > a
echo b > b
hg ci -A -m 0 -d "1000000 0"
echo aa > a
echo bb > b
hg ci -m 1 -d "1000000 0"
hg tag -l foo
hg update 0
hg parents -b 

# test update
hg update -b foo
hg parents

# test merge
hg update 0
echo c > c
hg ci -A -m 0.0 -d "1000000 0"
hg merge -b foo
hg parents -b 

# re-test with more branches
hg update -C 0
echo d > d
hg ci -A -m 0.0 -d "1000000 0"
hg merge -b foo
hg parents -b