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

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

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

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

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

martinvonz accepted this revision. martinvonz added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > test-copies.t:541 > + $ hg up 2 -q > + $ hg graft -r 4 --base 3 --hidden > + grafting 4:af28412ec03c "added d, modified b" (tip) Interesting, I wasn't aware

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

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

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

khanchi97 added a comment. I have updated the commit message too. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5961 To: khanchi97, #hg-reviewers Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list

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

khanchi97 updated this revision to Diff 14346. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5961?vs=14308=14346 REVISION DETAIL https://phab.mercurial-scm.org/D5961 AFFECTED FILES tests/test-copies.t

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

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

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

martinvonz added inline comments. INLINE COMMENTS > test-copies.t:495-497 > +Test for a case in fullcopytracing algorithm where both the merging csets are > +dirty which means no cset is descendant of merging base. This test reflect > +that for this particular case this algorithm correctly find

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

martinvonz added inline comments. INLINE COMMENTS > test-copies.t:524 > + $ echo baba >> b > + $ hg ci --amend -m "added d" > + Could you change the message here to "added d, modified b"? (Also see my next comment for why I care) > test-copies.t:526 > + > + $ hg log --git -pG --hidden -T

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

khanchi97 added a comment. In https://phab.mercurial-scm.org/D5961#88217, @martinvonz wrote: > From `test-check-code.t`: > > @@ -15,6 +15,13 @@ > Skipping i18n/polib.py it has no-che?k-code (glob) > Skipping mercurial/statprof.py it has no-che?k-code (glob) >

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

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

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

martinvonz added a comment. From `test-check-code.t`: @@ -15,6 +15,13 @@ Skipping i18n/polib.py it has no-che?k-code (glob) Skipping mercurial/statprof.py it has no-che?k-code (glob) Skipping tests/badserverext.py it has no-che?k-code (glob) +

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

That's totally fine, reviews it when you have time. Thanks :) On Thu 28 Feb, 2019, 6:08 AM martinvonz (Martin von Zweigbergk) < phabrica...@mercurial-scm.org wrote: > martinvonz added a comment. > > > In https://phab.mercurial-scm.org/D5961#87961, @khanchi97 wrote: > > > @martinvonz I have

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

martinvonz added a comment. In https://phab.mercurial-scm.org/D5961#87961, @khanchi97 wrote: > @martinvonz I have moved the tests in `test-copies.t` Thanks. https://phab.mercurial-scm.org/D5963 seems more complicated, so I'll review this series when I can find a larger chunk of

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

@martinvonz I have moved the tests in `test-copies.t` On Mon, Feb 25, 2019 at 10:58 PM martinvonz (Martin von Zweigbergk) < phabrica...@mercurial-scm.org> wrote: > martinvonz added inline comments. > > INLINE COMMENTS > > > test-copytrace-heuristics.t:724-728 > > + $ cat >> $HGRCPATH << EOF > >

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

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

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

martinvonz added inline comments. INLINE COMMENTS > test-copytrace-heuristics.t:724-728 > + $ cat >> $HGRCPATH << EOF > + > [experimental] > + > evolution.createmarkers=True > + > evolution.allowunstable=True > + > EOF Since this does not seem to set `experimental.copytrace = heuristics`

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

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

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

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Adding a test for fullcopytracing algorithm where both the merging csets are dirty, which means no cset is descendant of merging base. This test shows that