Page MenuHomePhabricator

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

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

Details

Summary

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

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

charlesetc created this revision.Fri, May 22, 3:36 PM
marmoute accepted this revision.Tue, May 26, 9:43 AM
charlesetc edited the summary of this revision. (Show Details)Tue, May 26, 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.