view tests/test-branch @ 3320:b16456909a0a

merge: various tidying update tests to handle corrected output and new workingctx display
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 02:15:20 -0500
parents 547d1a4aa105
children
line wrap: on
line source

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