branch closing: referencing open and closed branches/heads
Treat fully closed branches similarly to "inactive" in the output of
'hg branches'. They will be suffixed with "(closed)" where inactive branches
are marked with "(inactive)". If the -a/--active option is given both
inactive and closed branches will not be shown.
Partially closed branches (multiple heads, at least one not closed)
will display the next (tipmost) open head.
Add -a/--active option to "hg heads" which will hide closed heads iff the
option is specified.
In other hg commands, when multiple branch heads exist the branch name will
refer to the tipmost open head, and if none exist, then the tipmost closed
head.
#!/bin/sh
# 0-2-4
# \ \ \
# 1-3-5
#
# rename in #1, content change in #4.
hg init t
cd t
touch 1
touch 2
hg commit -Am init -d "0 0" # 0
hg rename 1 1a
hg commit -m rename -d "0 0" # 1
hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 -d "0 0" # 2
hg merge --debug 1
hg ci -m merge1 -d "0 0" # 3
hg co -C 2
echo hello >> 1
hg ci -m unrelated2 -d "0 0" # 4
hg co -C 3
hg merge -y --debug 4
hg co -C 4
hg merge -y --debug 3