1482213 - Submitting a non-tip revision with an invalid review does not restore tree to original state

Status: RESOLVED WONTFIX

(Conduit :: moz-phab, defect)

Description

[Tom Ritter [:tjr]]

I had commits like [-central] -> A -> B -> C -> D

I ran the command 'moz-phab submit B B' where commit B contained the (meta-reviewer) r?Build

> moz-phab submit 479192 479192
> Submitting 1 commit:
> 479192:050b5ca3343d Bug 1481638 Do not pass CFI sanitization flags to MOZ_CARGO_WRAP_LDFLAGS r=Build
> 050b5ca3343d is based off non-public commit da06afc471df
> Submit to Phabricator (YES/No/Always)? YES
> 
> Creating new revision:
> 479192:050b5ca3343d Bug 1481638 Do not pass CFI sanitization flags to MOZ_CARGO_WRAP_LDFLAGS r=Build
>  Exception
> Error parsing field "Reviewers": The objects you have listed include objects which do not exist (Build).
> (Run with `--trace` for a full exception trace.)
> Exception: command 'arc' failed to complete successfully

This has left my tree as [-central] -> A -> B  and something else is odd as I can no longer run 'hg histedit'

Comment 1

[:glob ✱]

not restoring the tree back to its original state is currently "by design", so this is working as expected.
bug 1481535 covers pre-validation of reviewers prior to submission, which would have caught this up-front.


the reason for not restoring the tree is the script performs at times a surprising amount of changes to your repo in order to update its state (pro-tip: if you don't have evolve installed, you should install it).  attempting to restore the repoistory when we're already in a failure state can potentially lead to making it worse and dataloss.  this may change as the script matures and the failure states become well known.

it's likely that all you'd need to do is rebase C back onto B, but it's hard to know without seeing the current state of your repo.  without knowing what happens when you run `hg histedit` it's hard to provide guidance there also.  reaching out to us on #phabricator (irc) may be the quickest way to get help with putting things back the way they were.