Hi Nick, George, David,
(I'm sending this email to tor-dev so everyone knows how Core Tor merges are going.)
Mainline Mergers
David is back from leave, so I'm going to stop doing mainline merges. But please let me know if there's a merge I can help with. (Email or Signal is best, IRC has a lot of backlog.)
Do we need to do a handover some time? The next team meeting might be a good time.
Mainline Merge Ready Tickets
I moved my mainline merge trac wiki queries to this page: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/Mainline...
That page should show all of the mainline merge_ready tickets, sorted by owner and reviewer. Your name is in bold, so you can work out which tickets you should merge. (We want 3 people to look at every ticket before it merges, except for trivial changes.)
Here is our full list of task tracking wiki pages: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam#TaskTrac...
When does 0.4.0 stop being mainline?
It looks like people aren't merging backports to 0.4.0 any more. That's probably a good idea: we should minimise release candidate changes.
When should I start doing 0.4.0 merges as part of the backports?
Backport Status
We released 0.4.0.4-rc last week, so I'm going to backport some low-risk changes to 0.2.9 and later. Most of these changes have been tested in 0.4.0.3-alpha.
I should be able to do the backports tomorrow or Tuesday.
Here are the backports for the next few days: https://trac.torproject.org/projects/tor/wiki/user/teor#Backports:0.5daysper...
Here are the backports I will do after I get back from my leave in May: https://trac.torproject.org/projects/tor/wiki/user/teor/HiddenBackports
T
-- teor ----------------------------------------------------------------------
On Wed, Apr 17, 2019 at 5:13 AM teor teor@riseup.net wrote:
When does 0.4.0 stop being mainline?
It looks like people aren't merging backports to 0.4.0 any more. That's probably a good idea: we should minimise release candidate changes.
When should I start doing 0.4.0 merges as part of the backports?
Just realized I hadn't answered this. Here's my suggestion, and please let me know if you disagree: I think that once we declare that 0.4.1 is stable, 0.4.0 merges count as backports. How does that sound?
On 31 May 2019, at 02:26, Nick Mathewson nickm@torproject.org wrote:
On Wed, Apr 17, 2019 at 5:13 AM teor teor@riseup.net wrote: When does 0.4.0 stop being mainline?
It looks like people aren't merging backports to 0.4.0 any more. That's probably a good idea: we should minimise release candidate changes.
When should I start doing 0.4.0 merges as part of the backports?
Just realized I hadn't answered this. Here's my suggestion, and please let me know if you disagree: I think that once we declare that 0.4.1 is stable, 0.4.0 merges count as backports. How does that sound?
That makes sense to me.
If there are any tickets where mainline mergers have missed an 0.4.0 merge, I can do them when I do the backports to 0.3.5 and earlier.
T
-
Nick Mathewson -
teor