effective use of in-repository branching

[Christian Boos]

Stuart Marks wrote:
> ...
> Unfortunately some of the proposals were quite heavyweight, and the 
> thread didn't seem to reach any reasonable conclusion.
> ...
> b) If the working copy has no parent, "hg update" and "pull -u" update 
> to the default branch instead of to the tip.

Another option would be to simply abort the update in case of ambiguity.

$ hg update
abort: multiple branches found, specify one of:
(here goes the output of 'hg heads --template 
"{branches}\t\t{rev}:{node|short}"')

The old behavior would still be available by calling explicitly 'hg 
update tip'.

-- Christian