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

[Tor Bug Tracker & Wiki]

#31314: Modify git-merge-forward.sh so it can create test merge branches
-------------------------------------------------+-------------------------
 Reporter:  teor                                 |          Owner:  teor
     Type:  enhancement                          |         Status:
                                                 |  needs_revision
 Priority:  Medium                               |      Milestone:  Tor:
                                                 |  0.4.2.x-final
Component:  Core Tor/Tor                         |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  git-scripts, network-team-roadmap-   |  Actual Points:  0.8
  october                                        |
Parent ID:  #31178                               |         Points:  1
 Reviewer:  asn                                  |        Sponsor:
                                                 |  Sponsor31-must
-------------------------------------------------+-------------------------
Changes (by asn):

 * status:  needs_review => needs_revision


Comment:

 Hmm, I'm missing some context on what this feature is for and who is
 supposed to use it and for which use case. That'd help me with review and
 testing here.

 Also should there be some documentation of how this test branch feature
 should work? I see some comments about "test branch mode" in git-merge-
 forward.sh but I don't quite understand how it works. The "test branch
 example" section seems useful, but it would be nice to have it in words
 too.

 Finally, any ideas on how to test this? I feel more confident testing a
 shell script than just reading shell code.

 Marking as needs_revision so that the above questions get answered to some
 capacity.

 PS: I'm leaving for camp tomorrow morning so I will probably not get to
 review this whole thing this week, and it might drag into next week. I
 have ACKed #29879 in the meanwhile.

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