Opened 16 months ago

Closed 7 months ago

#30917 closed enhancement (fixed)

Add instructions for making a new maint branch to, and rename the file

Reported by: teor Owned by: nickm
Priority: Medium Milestone: Tor: 0.4.4.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: sponsor31-maybe, 043-should, postfreeze-ok
Cc: gaba Actual Points: .1
Parent ID: Points: 0.5
Reviewer: teor Sponsor:


When we stop supporting a tor release, we follow the instructions in
But we don't have any instructions for a new maint branch or new release series.

Since the instructions are pretty similar, we should put them in, and then find a better name for that file.

Nick will write up a pad, and then I will put it in the file.

Gaba, I think this could be a Sponsor 31 task, because it is about best practices.

Child Tickets

#30839taskclosedteorUpdate with our latest end of life process

Change History (20)

comment:1 Changed 16 months ago by teor

Parent ID: #30839#30835

comment:2 Changed 16 months ago by teor

Saving the pad here:

Steps for starting a new maint branch

  1. Ideally, do this immediately after a release.
  1. Start a new maint-x.y.z branch based on master, and a new release-x.y.z branch based on master. They should have the same starting point.
  1. Push both of these branches to the master git repository.
  1. In master, change the version to "0.x.y.0-alpha-dev". Run the script, and commit this version bump.
  1. Tag the version bump with "tor-0.x.y.0-alpha-dev". Push the tag and master.
  1. Open tickets for connecting the new branches to various other places. Some of the children are are an examples of these tickets.
  1. Remove practracker from the check-local Makefile target in maint-x.y.z branch only. Merge to release-0.xy.z but do not forward-port to master.

Finally, make sure this document is up to date with our latest process.

comment:3 Changed 16 months ago by teor

Parent ID: #30835#30839
Status: assignedneeds_revision

Part of #30839

comment:4 Changed 13 months ago by teor

Keywords: network-team-roadmap-september added

comment:5 Changed 13 months ago by teor

Milestone: Tor: 0.4.1.x-finalTor: 0.4.2.x-final

comment:6 Changed 13 months ago by teor

Type: defectenhancement

comment:7 Changed 13 months ago by teor

Keywords: 041-should removed

comment:8 Changed 12 months ago by teor

Keywords: network-team-roadmap-? added; network-team-roadmap-september removed
Milestone: Tor: 0.4.2.x-finalTor: 0.4.3.x-final

comment:9 Changed 9 months ago by nickm

Keywords: 043-should postfreeze-ok added

comment:10 Changed 9 months ago by gaba

Keywords: sponsor31-maybe, network-team-roadmap-? 043-should postfreeze-oksponsor31-maybe, network-team-roadmap-?, 043-should, postfreeze-ok

comment:11 Changed 9 months ago by gaba

Keywords: network-team-roadmap-? removed

comment:12 Changed 9 months ago by teor

Owner: teor deleted
Status: needs_revisionassigned

Someone else can do this in 0.4.3, or we can delay it to 0.4.4, and I'll have another look at it.

comment:13 Changed 9 months ago by teor

Status: assignedneeds_revision

comment:14 Changed 8 months ago by nickm

Owner: set to nickm
Status: needs_revisionaccepted

comment:15 Changed 8 months ago by nickm

Actual Points: .1
Milestone: Tor: 0.4.3.x-finalTor: 0.4.4.x-final
Status: acceptedneeds_review

I've done the best version I can for now at .

comment:16 Changed 8 months ago by teor

Reviewer: teor

comment:17 Changed 8 months ago by teor

Parent ID: #30839

comment:18 Changed 8 months ago by teor

Status: needs_reviewneeds_revision

Thanks for updating this document. Sorry it took me a while to get to it, I have been a bit busy with Sponsor 55, Outreachy, GSOC, and feedback the past few weeks.

I have asked for a bunch of tweaks to the doc. I'm also happy to make those changes myself, and get you to review them?

comment:19 Changed 7 months ago by nickm

Status: needs_revisionneeds_review

I've made the requested edits; sorry for the delay.

comment:20 Changed 7 months ago by teor

Resolution: fixed
Status: needs_reviewclosed

Thanks for this change, I made some tweaks, and merged to master.

Here are the changes I made:

  • resolved conflicts by ignoring formatting changes
  • re-applied formatting changes
  • tweaked structure to put "end" and "beginning" of life into second-level subsections
  • included "disable practracker in hooks" as part of the "beginning" instructions
Note: See TracTickets for help on using tickets.