martinvonz added inline comments. martinvonz marked an inline comment as done.
INLINE COMMENTS > pulkit wrote in test-rebase-conflicts.t:460 > I think it will be weird to have current parents as 7 and 8. Rebase copies > commit, so if there is a merge commit, it copies it instead of recreating > one. Also if we have 7 and 8 as parents, we might not have correct conflicts. I've updated the comment to not be opinionated. I hope we can now queue this patch (and a few more in this series) regardless of what we think of D7827 <https://phab.mercurial-scm.org/D7827>. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7824/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7824 To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
