stymied by default update

[John Turner]

On Tue, 30 Dec 2014 22:02:59 -0500, Scott Palmer <swpalmer at gmail.com>  
wrote:

>
>> On Dec 30, 2014, at 9:26 PM, John Turner <jjturner at energi.com> wrote:
>>
>
>> I've gotten into the (bad?) habit of running:
>> $ hg update null
>
> Yes. That seems like a bad habit.
>
>> So the null parent makes sense in that case - but if so, how to  
>> 'recover' the root changeset which still holds my 655 files?
>
> Hg merge
>
>
> Regards,
>
> Scott

Right - I previously got crossed-up thinking I needed to do Hg update  
prior to Hg merge.  But I got my repo squared away now, thanks!

Cheers,
John