From patchwork Sat Mar 6 00:41:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D10117: tests: demonstrate how grafted copies are counted when tracing across branches From: phabricator X-Patchwork-Id: 48432 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Sat, 6 Mar 2021 00:41:18 +0000 martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This test demonstrates a regression from 1d6d1a15 . REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10117 AFFECTED FILES tests/test-copies.t CHANGE DETAILS To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/tests/test-copies.t b/tests/test-copies.t --- a/tests/test-copies.t +++ b/tests/test-copies.t @@ -378,6 +378,32 @@ $ hg debugpathcopies 1 3 x -> z +Copy x->y on two separate branches. Pathcopies from one branch to the other +should not report the copy. + $ newrepo + $ echo x > x + $ hg ci -Aqm 'add x' + $ hg cp x y + $ hg ci -qm 'copy x to y' + $ hg co -q 0 + $ hg graft 1 -q + $ hg l + @ 2 copy x to y + | y + | o 1 copy x to y + |/ y + o 0 add x + x + $ hg debugp1copies -r 1 + x -> y + $ hg debugp1copies -r 2 + x -> y +BROKEN: These two should not report any copies + $ hg debugpathcopies 1 2 + x -> y + $ hg debugpathcopies 2 1 + x -> y + Copy x to y on one side of merge, create y and rename to z on the other side. $ newrepo $ echo x > x