martinvonz added a comment.
Heads up that we ran into a fun bug that was probably caused by this patch. I think what happened was this: 1. User ran with an older hg, which sets two dirstate parents while rebasing 2. User ran into a merge conflict and was dropped out to their shell 3. User upgraded hg to the new version (with this patch) 4. User ran `hg rebase --continue` with the new version, which respects the dirstate parents and thus creates a merge commit (!) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7827/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7827 To: martinvonz, #hg-reviewers, durin42 Cc: mjpieters, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
