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.
>
One specific, potential issue. This was my home directory.

I don't understand exactly what goes on while the evolve is executing. 
Is the working directory modified during the evolve? Do changes in the 
working directory while the evolve is running affect things?

-ernie


> Can you give us a bit more details on these conflict to help us 
> understand where they came from ?
>
> -- 
> Pierre-Yves David

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20240526/1a2fdb15/attachment.html>