quark added a comment.
About the warning of unwanted changes, when thinking about it again, it seems sometimes people may want to do that kind of rebase. If we let them edit the merge result (ex. a merge conflict), than the workflow looks good - it's just the merge algorithm being suboptimal in that case. I guess in real-world cases it would most likely produce a merge conflict so am leaning towards a warning now. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D21 To: quark, durin42, #hg-reviewers Cc: martinvonz, durin42, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
