1731814 - `moz-phab reorg` doesn't know how to reorg a non-linear stack

Status: RESOLVED FIXED

(Conduit :: moz-phab, defect)

Description

[Julien Wajsberg [:julienw]]

STR:

1. I pushed to phabricator a sequence of commits.
2. I changed the order of these commits, then called moz-phab submit again.

=> It added a second child to an existing revision.

3. I called moz-phab reorg to fix this, but got this error:

Remote stack is not linear... -
Revision D126207 has multiple children.

Then I went to edit this revision manually, remove the extra child, and call moz-phab reorg again with success this time.

I'm using git if that's important.

Also at step 2, I think I had a new commit to submit too. I'm not too sure this was the extra child, but this may have been.

Comment 1

[Paul Adenot (:padenot)]

Attachment: Bug 1731814 - Implement reorg --force. r?sheehan

Comment 2

[BMO Github Automation]

Authored by https://github.com/padenot
https://github.com/mozilla-conduit/review/commit/a6aae763e4bb1a1cf691eb7700464754ec071a5f
[main] Bug 1731814 - Implement reorg --force. r=sheehan