tests/test-branch
author Matt Mackall <mpm@selenic.com>
Mon, 25 Sep 2006 16:45:31 -0500
changeset 3153 c82ea81d6850
parent 3071 547d1a4aa105
permissions -rwxr-xr-x
Add core copy detection algorithm This adds findcopies, which detects merge-relevant copies between files in a pair of manifests back to the merge ancestor. While the merge code invokes the copy detection routine, it does not yet use the result.

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