2 heads but "nothing to merge"

Peter Bourgon mercurial.peter at bourgon.org
Mon May 16 10:24:48 UTC 2011


'default' is the default branch by definition. I'm pretty sure you
can't just "get rid" of it (but someone can correct me if I'm wrong).
If 'code' is your default branch in everything but name, I recommend
making it the official default branch, via

 $ hg update default
 $ hg merge code
 $ hg commit -m "Merge code branch to default"


On Mon, May 16, 2011 at 12:09 PM, aivarannamaa <aivar.annamaa at gmail.com> wrote:
> 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
>
>
> --
> View this message in context: http://mercurial.808500.n3.nabble.com/2-heads-but-nothing-to-merge-tp2947222p2947222.html
> Sent from the General mailing list archive at Nabble.com.
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>



More information about the Mercurial mailing list