[tor-bugs] #30429 [Applications/Tor Browser]: Rebase Tor Browser patches for Firefox ESR 68

[Tor Bug Tracker & Wiki]

#30429: Rebase Tor Browser patches for Firefox ESR 68
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  tbb-
                                                 |  team
     Type:  task                                 |         Status:
                                                 |  needs_revision
 Priority:  Very High                            |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  TorBrowserTeam201907, tbb-9.0-must-  |  Actual Points:
  nightly                                        |
Parent ID:                                       |         Points:
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------

Comment (by acat):

 Replying to [comment:15 mcs]:
 > Alex, we have a couple of questions about the rebasing process:
 >
 > 1. Do you want to rebase your rebased patches onto the tip of Mozilla's
 esr68 branch (or a recent tag) before Kathy and I do our rebasing work? I
 think that makes sense unless it turns out to be very time consuming.

 I will do that, after I address the requested changes here. Since I assume
 this is blocking for you, I will try to do it soon.

 > 2. Previous attempts to reorder the patches while rebasing have not gone
 well; it would be better if we preserved the order so for example the
 #4234 patch comes before the other updater-related patches such as the
 #16940 one. Is it OK if Kathy and I create a new branch with the rebased
 patches for the following tickets inserted in a similar place within the
 commit stream as for the ESR60 Tor Browser branches: #18900, #13252,
 #19121, #4234, #13379? The only downside that I see is that if you are
 working in parallel with us someone will need to cherry pick some patches
 from our branch along with all of your patches to create a consolidated
 branch (or do something else magical with git).

 I think this is fine, I don't see any issue with cherry-picking the
 updater patches to a more up to date consolidated branch later, if needed.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/30429#comment:16>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online