This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6476

merge: correct argument name in docstring
ClosedPublic

Authored by av6 on Jun 4 2019, 5:29 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG127937874395: merge: correct argument name in docstring

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

av6 created this revision.Jun 4 2019, 5:29 AM
pulkit accepted this revision.Jun 4 2019, 9:50 AM
Closed by commit rHG127937874395: merge: correct argument name in docstring (authored by av6). · Explain WhyJun 4 2019, 10:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)

Diff 15332

mercurial/merge.py

addition to the merge, this fixes up the dirstate to include only addition to the merge, this fixes up the dirstate to include only
a single parent (if keepparent is False) and tries to duplicate any a single parent (if keepparent is False) and tries to duplicate any
renames/copies appropriately. renames/copies appropriately.
ctx - changeset to rebase ctx - changeset to rebase
pctx - merge base, usually ctx.p1() pctx - merge base, usually ctx.p1()
labels - merge labels eg ['local', 'graft'] labels - merge labels eg ['local', 'graft']
keepparent - keep second parent if any keepparent - keep second parent if any
keepparent - if unresolved, keep parent used for the merge keepconflictparent - if unresolved, keep parent used for the merge
""" """
# If we're grafting a descendant onto an ancestor, be sure to pass # If we're grafting a descendant onto an ancestor, be sure to pass
# mergeancestor=True to update. This does two things: 1) allows the merge if # mergeancestor=True to update. This does two things: 1) allows the merge if
# the destination is the same as the parent of the ctx (so we can use graft # the destination is the same as the parent of the ctx (so we can use graft
# to copy commits), and 2) informs update that the incoming changes are # to copy commits), and 2) informs update that the incoming changes are
# newer than the destination so it doesn't prompt about "remote changed foo # newer than the destination so it doesn't prompt about "remote changed foo
# which local deleted". # which local deleted".