2 heads but "nothing to merge"

[Patrick Mézard]

Le 16/05/11 12:09, aivarannamaa a écrit :
> Hi,
> 
> I have an old branch, which is markerd as inactive, but as its name is
> "default" it gets in the way every time when i clone the repo. How can I get
> rid of this head? Here's some info about the situation (I want to get rid of
> head 369):
> 
> 
> D:\workspaces\alvor-core>hg heads
> changeset:   575:14b11427b423
> branch:      code
> tag:         tip
> user:        aivar.annamaa at gmail.com
> date:        Fri May 13 15:51:44 2011 +0300
> summary:     weekend
> 
> changeset:   396:b4cab8a2d122
> user:        Carl-Johan Sveningsson <cj at sveningsson.info>
> date:        Wed Sep 15 16:07:01 2010 +0300
> summary:     Removing debug stuff
> 
> 
> D:\workspaces\alvor-core>hg branches
> code                         575:14b11427b423
> default                      396:b4cab8a2d122 (inactive)
> 
> D:\workspaces\alvor-core>hg merge
> abort: there is nothing to merge

"hg help merge" says:

    If no revision is specified, the working directory's parent is a head
    revision, and the current branch contains exactly one other head, the
    other head is merged with by default. Otherwise, an explicit revision with
    which to merge with must be provided.

Try:

  $ hg up code
  $ hg merge default

--
Patrick Mézard