Page MenuHomePhabricator

merge: remove unused keepparent argument for graft()
AbandonedPublic

Authored by martinvonz on Jan 6 2020, 7:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

The option was added in d6859d86a5d5 (merge.graft: add option to keep
second parent, 2015-12-03) in order to help fix
https://bz.mercurial-scm.org/show_bug.cgi?id=4389, but no code was
ever added to either core or evolve to pass the option. Evolve handles
at least some kinds of orphan merges these days, so I suspect this
turned out to not be needed.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 6 2020, 7:58 PM
pulkit added a subscriber: pulkit.Jan 9 2020, 8:58 AM

but no code was ever added to either core or evolve to pass the option

It seems like evolve does use this option. https://www.mercurial-scm.org/repo/evolve/file/tip/hgext3rd/evolve/evolvecmd.py#l1104

but no code was ever added to either core or evolve to pass the option

It seems like evolve does use this option. https://www.mercurial-scm.org/repo/evolve/file/tip/hgext3rd/evolve/evolvecmd.py#l1104

I naively just grepped for "keepparent" and missed that case since it's passing it as a positional argument. Thanks, I'll abandon this patch.

martinvonz abandoned this revision.Jan 9 2020, 12:12 PM