Need help recovering after mistaken prune

[Ernie Rael]

On 24/05/21 1:33 AM, Pierre-Yves David wrote:
>
>
> On 5/2/24 19:31, Ernie Rael wrote:
>>
>> Hi All, I screwed up big time,
>>
>> I was in the wrong directory when I executed
>>
>>     $ hg prune 78
>>     1 changesets pruned
>>     94 new orphan changesets
>>
>> I tried "hg touch 78", but attempts to use evolve/rebase wants to do 
>> merge resolution and that's not an option.
>>
> When evolving after the touch, you should not have to deal with conflict.
>
> Can you give us a bit more details on these conflict to help us 
> understand where they came from ?
>
I think the problems I had were due to cockpit errors.

I had repaired using debug commands. But to test and recreate the 
situation I did

    cp -a .hg /junk
    hg udpate -C

Back to where I was, did the command I wish I hadn't

    hg prune 78

So, at this point my working directory is at the end of a long unstable 
orphaned branch.

    hg touch 78
    hg evove -r 79::

and everything worked fine.

I looked at the evolve help (not in a panic) to come up with the working 
solution.

I don't remember exactly what I did before. I think I was too hands on, 
trying to  micromanage the process. I also just tried

    hg evolve --any

and that worked OK.

> -- 
> Pierre-Yves David

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20240525/958a67f7/attachment-0001.html>