Page MenuHomePhabricator

graft-state: save --base in graft's state, fixing bug with graft --continue

Authored by charlesetc on May 22 2020, 3:36 PM.



Without this change, running graft --continue after grafting a merge commit using --base
(and encountering conflicts) will output "skipping ungraftable merge revision" even though
we specified a base in the initial graft command.

Graft's improve behaviour is reflected in test-graft.t.

Diff Detail

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

Event Timeline

charlesetc created this revision.May 22 2020, 3:36 PM
marmoute accepted this revision.May 26 2020, 9:43 AM
charlesetc edited the summary of this revision. (Show Details)May 26 2020, 11:14 AM
charlesetc updated this revision to Diff 21474.
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.