[Commented On] D8727: rebase: add test case that shows that inmemory rebase does not preserve merges

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Mon Jul 13 21:15:23 UTC 2020


martinvonz added a comment.


  In D8727#130348 <https://phab.mercurial-scm.org/D8727#130348>, @mjacob wrote:
  
  > In D8727#130344 <https://phab.mercurial-scm.org/D8727#130344>, @martinvonz wrote:
  >
  >> This patch is based on c4e02bd172d57879717f8bc04c4b5bbc9268e36d, but I don't see any such commit. Can you rebase it to a public commit?
  >
  > I rebased D8724 <https://phab.mercurial-scm.org/D8724> to D8733 <https://phab.mercurial-scm.org/D8733> onto `@`. Strictly speaking, D8727 <https://phab.mercurial-scm.org/D8727> is not dependent on D8725 <https://phab.mercurial-scm.org/D8725> or D8724 <https://phab.mercurial-scm.org/D8724>, but D8729 <https://phab.mercurial-scm.org/D8729> is dependent on D8724 <https://phab.mercurial-scm.org/D8724>, so it made sense to keep all of them as a linear chain.
  
  It does seem to be textually dependent on D8724 <https://phab.mercurial-scm.org/D8724> -- the patch didn't apply before. Thanks!

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8727/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8727

To: mjacob, #hg-reviewers
Cc: martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200713/bf4ce381/attachment-0002.html>


More information about the Mercurial-patches mailing list