[PATCH] merge: improve error messages when aborting because of head count

[Martin Geisler]

Greg Ward <greg-hg at gerg.ca> writes:

> On Mon, Jun 14, 2010 at 6:05 PM, Matt Mackall <mpm at selenic.com> wrote:
>> On Mon, 2010-06-14 at 17:49 -0400, Greg Ward wrote:
>>> On Mon, Jun 14, 2010 at 5:13 PM, Matt Mackall <mpm at selenic.com> wrote:
>>> > Still don't get why you think -t is the right thing here. Topological
>>> > heads does not include all the heads on other branches.
>>>
>>> Partly local prejudice.  When I run "hg heads" in our big production
>>> repo, I get 112 branch heads, around 105 of which are boring ancient
>>> history.  Example:
>>
>> Hmm, perhaps we should recommend "hg branches" instead?
>
> But that also prints out 112 branch heads, around 105 of which are
> ancient history.  If you had said "hg branches -a", sure, that would
> make sense.  It's not quite the same as "hg heads -t", but it's close
> enough most of the time.

You could close the heads with 'hg commit --close-branch'. That will
remove them from 'hg heads'.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/mercurial/