problem with hg histedit (evolved enabled)

[Pulkit Goyal]

On Wed, Oct 2, 2019 at 6:10 PM Uwe Brauer <oub at mat.ucm.es> wrote:
>
> >>> "PG" == Pulkit Goyal <7895pulkit at gmail.com> writes:
>
>    > Hi Uwe,
>    > The situation you have encountered is a bug in histedit and is fixed
>    > recently by Augie. It will be released in next mercurial release.
>
> Thanks, I felt a bit stupid.
> What is your advice to avoid such a Szenario in the future, not to use
> histedit till the fix released.

You can definitely use histedit before that. This bug is about when
you have untracked files in your working directory before histedit
which conflicts with some changes done by histedit.

>
> I compiled mercurial from the stable branch. Is the fix already there?

The commit is there on default branch at the moment.
>
>    > About lost changesets, you should be able to get them from backups.
>
> Luckily enough I could recover the file which correspond to that
> changesets. What do you mean by recovering them from backup, could you
> please elaborate, that would be helpful in similar situations in the future.

I mean in case you had evolve disabled, and used histedit, it keeps a
backup of changesets which were stripped during the process.
However, if I understand correctly, you use evolve. So the backup
advice is not useful here.