Page MenuHomePhabricator

graft-state: add test to document problem with graft --continue, after --base
AbandonedPublic

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

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Summary

Instead of remembering the --base from the initial graft call, graft --continue
errors, complaining that the revision is ungraftable. Fix to follow.

Diff Detail

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

Event Timeline

charlesetc created this revision.May 22 2020, 3:36 PM

I expected these two commits (D8577 and D8578) to be in the same Phabricator "Diff", but it seems like there are two. Let me know if I should merge the two diffs or fold the commits together!

charlesetc retitled this revision from graft-state: add test to document problem with graft --continue, after graft --base to graft-state: add test to document problem with graft --continue, after --base.May 22 2020, 3:53 PM

I think you can simply fold them and run phab send again.

marmoute accepted this revision.May 26 2020, 10:05 AM

Awesome I did the fold and D8578 now contains all the changes. Should this diff be closed now?

Awesome I did the fold and D8578 now contains all the changes. Should this diff be closed now?

yes abandon it.

I don't see the changes as having been folded: there are changes in 8578 that aren't here. Missed a phabsend maybe?

charlesetc abandoned this revision.May 26 2020, 12:53 PM

Yeah I think D8578 is the source of truth now and contains all the changes.