problem with hg histedit (evolved enabled)

[Malcolm Matalka]

Uwe Brauer <oub at mat.ucm.es> writes:

> Hi
>
> I had 2 commits which I wanted to push, before I realised I need to
> modify the last commit message.
>
>  I run hg histedit
>
> Emacs popped up, I chose message for the latest commit and pick for
> penultimate commit saved and then nothing happened, however the
> penultimate commit was marked as obsolete, the commit message did not
> change.

It's kind of hard to understand exactly what you did.  You modified the
commit from "pick" to "m" or "mess".  And then saved that file and
exited, and then what happened?  Did you get an editor come up with the
commit message in it to modify?  Nothing happened but did the status
change? Any output?  Was there an error message about starting your
editor?  Is your EDITOR specified?

>
> I run hg histedit --continue
>
> Basically with the same result.
>
> So after 2 iterations, I disabled evolve and repeated the process.
>
> Now the repository is in a strange state 
>
> I run hg up tip and I obtain 
>
> warning: ignoring unknown working parent 922dc685b7e9!
> Rome-Notes/main.out: untracked file differs
> Rome-Notes/main.synctex.gz: untracked file differs
> Rome-Notes/main.toc: untracked file differs
> abort: untracked files in working directory differ from files in requested revision
>
>
> The last two commits are not displayed and I am stuck.
>
> Any help is appreciated.
>
> Regards
>
> Uwe Brauer 
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 487 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20191002/042786af/attachment.asc>