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

[khanchi97 (Sushil khanchi)]

khanchi97 added inline comments.

INLINE COMMENTS

> copies.py:571
> +                                   copy, bothdiverge, bothincompletediverge)
> +        remainder.update(remainder1)
> +    elif dirtyc1:

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 :/

REPOSITORY
  rHG Mercurial

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

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