#31314: Modify git-merge-forward.sh so it can create test merge branches --------------------------+------------------------------------ Reporter: teor | Owner: teor Type: enhancement | Status: needs_review Priority: Medium | Milestone: Tor: 0.4.2.x-final Component: Core Tor/Tor | Version: Severity: Normal | Resolution: Keywords: git-scripts | Actual Points: 0.6 Parent ID: #31178 | Points: 1 Reviewer: | Sponsor: Sponsor31-can --------------------------+------------------------------------ Changes (by teor):
* status: assigned => needs_review * actualpoints: => 0.6 * milestone: => Tor: 0.4.2.x-final Comment: Please see my pull request: * master: https://github.com/torproject/tor/pull/1219 It is based on #29879, because they both modify git-push-all.sh. Here is an example: {{{ $ cd maint-0.2.9 # goes to the backport directory $ git checkout ticket99999_backport # checks out the backport branch $ git-merge-forward.sh -t ticket99999 # creates ticket99999_029 from ticket99999_backport # merges forward into ticket99999_035 ... ticket99999_master $ git-push-all.sh -t ticket99999 -r gh-rw # pushes ticket99999_029 ... ticket99999_master to remote gh-rw }}} -- Ticket URL: <https://trac.torproject.org/projects/tor/ticket/31314#comment:5> Tor Bug Tracker & Wiki <https://trac.torproject.org/> The Tor Project: anonymity online
_______________________________________________ tor-bugs mailing list tor-bugs@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs