[Request] [- ] D8598: rebase: drop duplicate call to copies.graftcopies()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri May 29 15:58:26 UTC 2020
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
merge.graft() already calls it
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8598
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -29,7 +29,6 @@
bookmarks,
cmdutil,
commands,
- copies,
destutil,
dirstateguard,
error,
@@ -1477,13 +1476,6 @@
repo, ctx, repo[base], labels=[b'dest', b'source'], wctx=wctx,
)
wctx.setparents(p1ctx.node(), repo[p2].node())
- if collapse:
- copies.graftcopies(wctx, ctx, repo[dest])
- else:
- # If we're not using --collapse, we need to
- # duplicate copies between the revision we're
- # rebasing and its first parent.
- copies.graftcopies(wctx, ctx, ctx.p1())
return stats
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200529/527f1849/attachment.html>
More information about the Mercurial-patches
mailing list