Closed Bug 1859380 Opened 2 years ago Closed 2 years ago

tracking bug for fix up of errant central -> beta merge

Categories

(Release Engineering :: General, defect)

Product:
Release Engineering
Component:
General
Type:
defect

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: bhearsum, Assigned: bhearsum)

Details

I messed up the beta -> release merge. I ran the correct dry run, and then failed to change the behavior to beta-to-release when running the non-dry run, which ended up running central-to-beta instead.

This caused:

  • Beta to become 120 a week early
  • Central to get a 120_END tag a week early

Three things were required to fix:

  1. Manually merge beta to release - This was done by combing through the dry run log and replicating the commands locally, then comparing the new changesets to the changesets pushed last cycle, and finally pushing them. This was fairly easily, although typescript does not log the manual .hgtags manipulation that it does (not even as a diff), which was confusing.

  2. Manually remove the FIREFOX_BETA_120_BASE tag from mozilla-central - This was also trivial. It required:

hg pull ssh://hg.mozilla.org/mozilla-unified
hg up -C -r central
hg tag -f --remove FIREFOX_BETA_120_BASE # -f because `central` wasn't a head at the time
hg commit --amend # to fix up the commit message to something that hg.m.o would accept
hg out -r tip ssh://hg.mozilla.org/mozilla-central # sanity check
hg push -r tip ssh://hg.mozilla.org/mozilla-central
  1. Revert mozilla-beta back to 119 (ie: undo everything that the central-to-beta task did). TBD in the next comment

(In reply to bhearsum@mozilla.com (:bhearsum) from comment #0)

  1. Revert mozilla-beta back to 119 (ie: undo everything that the central-to-beta task did). TBD in the next comment
hg up -C -r beta
hg diff -r f2a69b23cb0aaf2b36bac4f9f197bf4282f542c4 --reverse > `tmpd`/reverse.diff # f2a69b... is the commit Beta is supposed to be
hg import --no-commit /home/bhearsum/tmp/2023-10-16/reverse.diff # apply the revert to the working directory
hg commit -m "bug 1859380: Revert beta back to 119. CLOSED TREE a=release"
hg diff -r f2a69b23cb0aaf2b36bac4f9f197bf4282f542c4 # sanity check - absolutely zero changes
hg tags | head # double check that there wasn't a 120_BASE or 119_END tag
hg out -r tip ssh://hg.mozilla.org/releases/mozilla-beta # sanity check that just the one new revision will be pushed
hg push -r tip ssh://hg.mozilla.org/releases/mozilla-beta

This should be all fixed now.

Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Assignee: nobody → bhearsum
You need to log in before you can comment on or make changes to this bug.