1863690 - `moz-phab uplift` doesn't work for beta to esr115 uplifts in mozilla-unified

Status: RESOLVED FIXED

(Conduit :: moz-phab, defect)

Description

[Mark Banner (:standard8)]

moz-phab version (from moz-phab --version): 1.4.3
Python version (from python3 --version): 3.9.8
OS: Mac 13.6.1

STR

1. Have a patch that you know is going to not apply cleanly on beta and esr.
2. Have a mozilla-unified repository with central checked out and your patch applied.
3. Run ./moz-phab uplift --train beta
4. Fix merge issues, and upload patch to phab.

At this stage, you are now based on beta with the altered patch applied to beta.

5. You know it will uplift fine from beta to esr, so run ./moz-phab uplift --train esr115
6. Accept the uplift request, noting that it says something about changing to planned changes.

Actual Results

The beta uplift created in step 4 has been altered to have the repository set as ESR, in the WIP state and with release-managers as reviewers, e.g. this revision.

Expected Results

The uplift should have created a new revision on phabricator and updated the bug appropriately.

Comment 1

[Mark Banner (:standard8)]

It is possible that bug 1863698 is related to this.

Comment 2

[Connor Sheehan [:sheehan]]

This should be fixed by D192151, if we can confirm the changes in the patch work as expected without breaking Phabricator in weird ways.

Comment 3

[Mathew Hodson]

Attachment: uplift: Allow uplifting from beta repo (Bug 1863690)

You can now use moz-phab uplift on an uplifted commit from beta
to create a new revision for release. As long as the --train
parameter is different from the previous uplift repo, a new
revision will be created.

Depends on D192151

Comment 4

[Connor Sheehan [:sheehan]]

Hey Mathew, are you still working on this? Either fixing the current patches or implementing one of the alternatives I described here?

Comment 5

[Mathew Hodson]

I separated this patch so it can land by itself.

Comment 6

[Mathew Hodson]

Do you want to take another look at this patch?