D5963: copies: handle a case when both merging csets are not descendant of merge base

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Mon Mar 11 11:34:37 EDT 2019


martinvonz added inline comments.

INLINE COMMENTS

> khanchi97 wrote in copies.py:571
> I am not sure if combining of partial copies in this case is correct or not. But I did combine these to do the similar behaviour as we are doing at other places. I don't have much knowledge about partial copies :/

I am also still not sure, even after spending several hours on this code :( But I am also not sure it's incorrect, and I don't want to hold up this patch more than I already have, so I'll queue this. Thanks for your patience. As I said before, I'm going to write a changeset-centric version of `mergecopies()` pretty soon, and then I'll have to understand this better. I'll also add more tests then. (I'm not trying to say that I think your patch is broken; it's just that the entire `mergecopies()` is pretty complicated, so I wouldn't be surprised if there are bugs anywhere in it.)

REPOSITORY
  rHG Mercurial

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

To: khanchi97, #hg-reviewers
Cc: martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list