D5962: copies: add test that makes both the merging csets dirty and fails

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfc4b7a46fda1: copies: add test that makes both the merging csets dirty and fails (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 marked 2 inline comments as done. khanchi97 added a comment. Thanks, I have updated the patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5962 To: khanchi97, #hg-reviewers Cc: martinvonz, mercurial-devel

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 updated this revision to Diff 14456. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5962?vs=14347=14456 REVISION DETAIL https://phab.mercurial-scm.org/D5962 AFFECTED FILES tests/test-copies.t CHANGE DETAILS diff --git

D5962: copies: add test that makes both the merging csets dirty and fails

martinvonz added inline comments. INLINE COMMENTS > test-copies.t:575 > + > + $ hg log -G -T '{rev} : {node|short} {desc} \n{phase}\n' > + @ 3 : 9a8bb7cc6814 added c As in the previous patch, I'd like to avoid hashes in the output by using `hg l`. > test-copies.t:608 > + > + $ hg

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 added a comment. Ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5962 To: khanchi97, #hg-reviewers Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 updated this revision to Diff 14347. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5962?vs=14309=14347 REVISION DETAIL https://phab.mercurial-scm.org/D5962 AFFECTED FILES tests/test-copies.t CHANGE DETAILS diff --git

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 updated this revision to Diff 14309. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5962?vs=14240=14309 REVISION DETAIL https://phab.mercurial-scm.org/D5962 AFFECTED FILES tests/test-copies.t CHANGE DETAILS diff --git

Re: D5962: copies: add test that makes both the merging csets dirty and fails

@martinvonz updated this one too. On Mon, Feb 25, 2019 at 11:01 PM martinvonz (Martin von Zweigbergk) < phabrica...@mercurial-scm.org> wrote: > martinvonz added inline comments. > > INLINE COMMENTS > > > test-copytrace-heuristics.t:931-980 > > + $ hg graft -r 6 --base c9241b0f2d5b --hidden > >

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 updated this revision to Diff 14240. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5962?vs=14091=14240 REVISION DETAIL https://phab.mercurial-scm.org/D5962 AFFECTED FILES tests/test-copies.t CHANGE DETAILS diff --git

D5962: copies: add test that makes both the merging csets dirty and fails

martinvonz added inline comments. INLINE COMMENTS > test-copytrace-heuristics.t:931-980 > + $ hg graft -r 6 --base c9241b0f2d5b --hidden > + grafting 6:99802e4f1e46 "added willconflict and d" (tip) > + ** unknown exception encountered, please report by visiting > + **

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 added a comment. Ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5962 To: khanchi97, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D5962: copies: add test that makes both the merging csets dirty and fails

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Discussion related to this issue can be found here: https://phab.mercurial-scm.org/D3896 There can be cases when both the changesets which we are