Closed Bug 1628031 Opened 4 years ago Closed 4 years ago

Cross-channel generation creates a new branch THUNDERBIRD_68_VERBRANCH

Categories

(Localization Infrastructure and Tools :: General, defect, P1)

defect

Tracking

(Not tracked)

VERIFIED FIXED

People

(Reporter: flod, Assigned: Pike)

References

Details

Bug 1627412 created a THUNDERBIRD_68_VERBRANCH in
https://hg.mozilla.org/releases/mozilla-esr68/

Which results into

abort: push creates new remote branches: THUNDERBIRD_68_VERBRANCH!
(use 'hg push --new-branch' to create new remote branches)

I assume we shouldn't be pushing new branches to gecko-strings (quarantine in this case)? So, what's the solution?

Also tried nuking the repository and latest.json, redoing the generation from scratch

$ hg out -r default ssh://hg.mozilla.org/users/axel_mozilla.com/gecko-strings-quarantine
comparing with ssh://hg.mozilla.org/users/axel_mozilla.com/gecko-strings-quarantine
searching for changes
changeset:   12851:34acbacd1427
branch:      THUNDERBIRD_68_VERBRANCH
user:        Sebastian Hengst <archaeopteryx@coole-files.de>
date:        Fri Apr 03 19:15:53 2020 +0200
summary:     Backed out changeset 81d762af65b9 because it merged the 68.7 branch and not the 68.6.1 one. a=backout

changeset:   12852:f8f4a81961a2
branch:      THUNDERBIRD_68_VERBRANCH
user:        Sebastian Hengst <archaeopteryx@coole-files.de>
date:        Mon Apr 06 22:55:02 2020 +0200
summary:     Revert switch to 68.6.1. a=fix-messed-up-situation

changeset:   12853:1068507af8b3
user:        Kai Engert <kaie@kuix.de>
date:        Fri Mar 27 16:34:50 2020 +0100

Should we ignore those 2 changesets (34acbacd1427, f8f4a81961a2) with the new system?

Flags: needinfo?(l10n)

This is a regression from 197c3ea58029, I need to drop non-default branches from the pushes in automate.py.

Assignee: nobody → l10n
Flags: needinfo?(l10n)
Priority: -- → P1

https://hg.mozilla.org/users/axel_mozilla.com/cross-channel-experimental/rev/e3a6bacafa2f059edc9bd83ded120c5672565c38 should fix this. At least it does for me locally.

There was also a bug around pulling the repos as part of automate, which I also fixed now.

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