https://bz.mercurial-scm.org/show_bug.cgi?id=6053
Bug ID: 6053 Summary: evolve can fall into unrecoverable state Product: Mercurial Version: 4.8.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: akhil...@google.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org Context: From #mercurial and #hg-evolve Owls: I cannot update/commit/amend because I have an evolve in progress. I cannot evolve because I have an outstanding uncommitted merge. I cannot merge because my working directory is not at a head revision. marmoute: just `rm .hg/evolvestate` and then hg up -C ." This resolves the problem, but ideally it should not be possible to get into this state. -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel