Page MenuHomePhabricator

graft: always allow hg graft --base . (issue6248)
ClosedPublic

Authored by valentin.gatienbaron on Feb 17 2020, 9:30 PM.

Details

Summary

hg graft --base . -r abc is rejected before this change with a
"nothing to merge" error, if abc does not descend from ..

This looks like an artifact of the implementation rather than intended
behavior. It makes perfect sense to apply the diff between . and
abc to the working copy (i.e. degenerate into hg revert),
regardless of what abc is.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute accepted this revision.Feb 24 2020, 10:36 AM
marmoute added a subscriber: marmoute.

The usecase looks correct, the test change seems correct and the test is good. I can't think of any issue here.

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.