D5961: copies: add test that makes both the merging csets dirty and run w/o error

[khanchi97 (Sushil khanchi)]

khanchi97 added a comment.


  Updating it acc to your suggestions.

INLINE COMMENTS

> martinvonz wrote in test-copies.t:495-497
> I don't follow this. What does "dirty" mean here? We normally mean that there are changes in the working copy when we say dirty, but that's clearly not what you mean here. The commit message is similarly confusing to me.

In this algorithms we call a merging cset "dirty" if it is not a descendant of merge base. And this test cover the case when both the csets are "dirty".

REPOSITORY
  rHG Mercurial

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

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