Opened 3 years ago

Closed 3 years ago

#3662 closed change (fixed)

Don't set the master bookmark automatically

Reported by: fhd Assignee: fhd
Priority: P3 Milestone:
Module: Infrastructure Keywords:
Cc: trev, matze Blocked By:
Blocking: Platform: Unknown / Cross platform
Ready: yes Confidential: no
Tester: Unknown Verified working: no
Review URL(s):

Description

Background

Until recently, the only way we've used Mercurial bookmarks was to set a master bookmark on all repositories before pushing updates to the Git mirrors.

Newer repositories like adblockplussafariios and adblockpluscore however have a managed master bookmark, which allows us to work with multiple bookmarked branches. We should have this for all repositories.

What to change

Update the GitHub hook of all repositories from changegroup.github = hg bookmark -q -r default master && hg push -q -b default github || true to txnclose.github = hg push -q github || true.

Change History (4)

comment:1 Changed 3 years ago by trev

  • Cc trev added

comment:2 Changed 3 years ago by fhd

  • Owner set to fhd

comment:3 Changed 3 years ago by fhd

  • Cc matze added
  • Priority changed from Unknown to P3
  • Ready set

Setting to Ready and P3. Matze, feel free to unset if you disagree.

comment:4 Changed 3 years ago by fhd

  • Resolution set to fixed
  • Status changed from new to closed

Alright, done, sorry for the delay.

I've updated GitHub hook for the following repositories:

  • abp2blocklist
  • abpbot
  • abpcrawler
  • abpcustomization
  • abpwatcher
  • adblockplusandroid
  • adblockpluschrome
  • adblockpluscore
  • adblockplus
  • adblockplusie
  • adblockplussafariios
  • adblockplussbrowser
  • adblockplustests
  • adblockplusui
  • buildtools
  • cms
  • elemhidehelper
  • facebook.adblockplus.me
  • infrastructure
  • jshydra
  • libadblockplus-binaries
  • libadblockplus
  • share.adblockplus.org
  • sitescripts
  • subscribe.adblockplus.org
  • testpages.adblockplus.org
  • web.acceptableads.org
  • web.adblockbrowser.org
  • web.adblockplus.org
  • web.eyeo.com
  • youtube.adblockplus.me

I'm not sure whether new bookmarks will make it to GitHub this way or not. But at least it won't cause any issues to our GitHub mirrors if we work with Mercurial bookmarks other than master now. Please bear in mind however that we need to address #3663 before we can do that in all repositories.

Note: See TracTickets for help on using tickets.