[tor-bugs] #31314 [Core Tor/Tor]: Modify git-merge-forward.sh so it can create test merge branches

Tor Bug Tracker & Wiki blackhole at torproject.org
Thu Aug 1 22:19:48 UTC 2019


#31314: Modify git-merge-forward.sh so it can create test merge branches
------------------------------+-------------------------
     Reporter:  teor          |      Owner:  teor
         Type:  enhancement   |     Status:  assigned
     Priority:  Medium        |  Milestone:
    Component:  Core Tor/Tor  |    Version:
     Severity:  Normal        |   Keywords:  git-scripts
Actual Points:                |  Parent ID:
       Points:  1             |   Reviewer:
      Sponsor:                |
------------------------------+-------------------------
 We should modify git-merge-forward.sh so it takes an optional branch base
 name.

 If the branch base name is set to bug1234, the script should:
 1. Create bug1234_029 from the local maint-0.2.9
 2. Create bug1234_035 from the local maint-0.3.5, and merge bug1234_029
 into it
 3. Repeat step 2 with each supported maint branch, and master

 We might also want to modify git-push-all.sh to take a branch base name,
 and push the branches created by git-merge-forward.sh.

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


More information about the tor-bugs mailing list