1561589 - Add https://hg.mozilla.org/releases/mozilla-esr68/ branch to gecko-dev

Status: RESOLVED FIXED

(Developer Services :: General, task)

Description

[Georg Koppen]

We'd like to have mozilla-esr68 as a branch in gecko-dev to be able to use that one in our upcoming Tor Browser switch to ESR68. (bug 1460199, bug 1342884, and bug 1250618 were similar, previous requests).

Comment 1

[rxu]

Hello, we need esr68 branch in github to build fennec China edition on Tuesday next week, would you please resolve this bug?

Comment 2

[:dhouse]

Attachment: add esr68 to vcs-sync beagle config

Hal, could you review this add of esr68 to vcs-sync for gecko-dev? (Aki is on pto.)

Comment 3

[:dhouse]

Testing with adding esr68:
I'm seeing errors because of vcs-sync using old mercurial (without sparserevlog).
I attempted a few hacks:

1. cloning with newer mercurial -- I think this is the best option to get a current clone of esr68, and then fix it later for catching updates to the branch
2. starting from older clone -- it failed to pull the updates with this route
3. turning off sparserevlog for the old mercurial (config not recognized; it isn't turned off in the request to the host but is client-side)

Comment 4

[Hal Wine [:hwine] use NI!]

Comment on attachment 9076546 [details] [diff] [review]
add esr68 to vcs-sync beagle config

Review of attachment 9076546 [details] [diff] [review]:
-----------------------------------------------------------------

lgtm R+

Comment 5

[:dhouse]

I cloned with a new mercurial, then served that locally, and cloned with the vcs-sync mercurial. This bypasses the sparserevlog format as prescribed at https://www.mercurial-scm.org/wiki/MissingRequirement#Repository_formats
I'm looking at changing the config to pull through this local new-clone for now (not ideal, because I need to keep it up-to-date and keep another daemon running to serve it ...).

Comment 6

[:dhouse]

The vcs-sync cron does not allow long enough for the local clone to complete. I turned it off (commented-out in the config) and manually cloned it and then I'll turn it back on to work off the manual clone.

Comment 7

[:dhouse]

The esr68 branch is available now on gecko-dev:
https://github.com/mozilla/gecko-dev/commits/esr68

Ran, could you verify this works now? (please ping me on irc/slack if this is not working?)

Comment 8

[rxu]

I built fennec using this branch and it seems working well for me.

Comment 9

[:dhouse]

Great!

re: the issues with vcs-sync and sparserevlog: I set up a cron to pull in new commits (I see more keep dropping in over the last day). So this will stay up-to-date for now; it is not a long-term solution but it will keep working short-term.

Comment 10

[:dhouse]

vcssync was moved to use git-cinnabar in bug 1629115
because of this, the workaround of a local relay clone of esr68 is not needed.
I've turned off that cloning cron and the local hg serve