[tor-bugs] #29604 [Core Tor/Tor]: Always pull-all before merge-forward

Tor Bug Tracker & Wiki blackhole at torproject.org
Thu Feb 28 18:14:14 UTC 2019


#29604: Always pull-all before merge-forward
--------------------------+----------------------------------
 Reporter:  teor          |          Owner:  (none)
     Type:  enhancement   |         Status:  closed
 Priority:  Medium        |      Milestone:  Tor: unspecified
Component:  Core Tor/Tor  |        Version:
 Severity:  Normal        |     Resolution:  invalid
 Keywords:  git-scripts   |  Actual Points:
Parent ID:                |         Points:  1
 Reviewer:                |        Sponsor:
--------------------------+----------------------------------
Changes (by dgoulet):

 * status:  new => closed
 * resolution:   => invalid


Comment:

 Ok I just realized that our merge forward script does a pull of the branch
 before merging forward as in making sure the branch is up to date.

 {{{
   # Update the current branch with a pull to get the latest.
   pull_branch "$current"
 }}}

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


More information about the tor-bugs mailing list