Opened 5 months ago

Last modified 5 months ago

#29548 new enhancement

Block back-merges of later release branches to earlier releases

Reported by: teor Owned by:
Priority: Medium Milestone: Tor: unspecified
Component: Core Tor/Tor Version:
Severity: Normal Keywords: git-scripts
Cc: rl1987 Actual Points:
Parent ID: Points: 1
Reviewer: Sponsor:

Description

In our release meeting in Brussels, we talked about blocking back-merges, where a merge is based on a later release branch, but it gets merged to an earlier branch:
https://trac.torproject.org/projects/tor/wiki/org/meetings/2019BrusselsNetworkTeam/Notes/StableMaintainer#ActionItems

Our merge workflow is typically:

  • base the bugfix branch on the maint branch for the earliest possible backport release
  • merge the bugfix branch to master (or alpha and master)
  • test for a while
  • merge the bugfix branch to an earlier release, then merge forward to master
  • merge maint-* into release-* for each release series

So I'm not sure exactly how we can limit ourselves to just these merges. Here are some ideas:

  • Count the commits, and put a limit on the number of commits
  • Keep an ordered list of releases, and check that:
    • maint: merged branches are based on this maint release, or an earlier maint release
    • release: merged branches are based on the same maint release
  • Is there some neat trick that I'm missing?

Child Tickets

Change History (1)

comment:1 Changed 5 months ago by rl1987

Cc: rl1987 added
Note: See TracTickets for help on using tickets.