Repository now has two "default" branches

[Terry Duell]

Hello All,
Not sure if what I'm seeing is an artifact of the way my TortoiseHG is
displaying things or not.
It looks as though Matthew Petroff's push (6773) created another default
branch, and a subsequent push by me landed in the old default whilst a
later one by Thomas landed in the new default.
Does someone know how to unravel this? I'd rather not try, I think the
last time I attempted anything mildly ambitious like this I caused a worse
mess!

Cheers,
--
Regards,
Terry Duell

[T. Modes]

Hi Terry,

no fear, there is nothing what can't be fixed.

In this case select first one of the both heads and update to this head.
Then select the second head and choose "Merge with local" from the context menu of TortoiseHG.
There will be some dialog boxes and at the end there will be only one head.
Go ahead.

Thomas

[Terry Duell]

Hello Thomas,

On Sat, 27 Dec 2014 19:21:14 +1100, T. Modes <Thomas...@gmx.de> wrote:

[snip]

>> Does someone know how to unravel this? I'd rather not try, I think the
>> last time I attempted anything mildly ambitious like this I caused a
>> worse
>>
>> mess!
>>
>
> no fear, there is nothing what can't be fixed.
>
> In this case select first one of the both heads and update to this head.
> Then select the second head and choose "Merge with local" from the
> context menu of TortoiseHG.
> There will be some dialog boxes and at the end there will be only one
> head.
> Go ahead.

All done...it looks OK.
Thanks Thomas.