[tor-bugs] #29905 [Core Tor/Tor]: git-maintainance-scripts: merge-forward should provide indications of merges actually occuring

[Tor Bug Tracker & Wiki]

#29905: git-maintainance-scripts: merge-forward should provide indications of
merges actually occuring
-----------------------------------------------+---------------------------
 Reporter:  asn                                |          Owner:  (none)
     Type:  defect                             |         Status:  new
 Priority:  Medium                             |      Milestone:  Tor:
                                               |  unspecified
Component:  Core Tor/Tor                       |        Version:
 Severity:  Normal                             |     Resolution:
 Keywords:  devops git-maintance-scripts easy  |  Actual Points:
Parent ID:                                     |         Points:
 Reviewer:                                     |        Sponsor:
-----------------------------------------------+---------------------------

Comment (by asn):

 In particular here is how a merge-forward looks like, for a merge-fwd only
 between `maint040->release040->master`:
 {{{
 $ ./git-merge-forward.sh
   [+] Fetching origin...success
 [+] Handling branch
 release-0.2.9 Handling branch
   [+] Switching branch to release-0.2.9...success
   [+] Merging branch origin/release-0.2.9...success
   [+] Merging branch maint-0.2.9 into release-0.2.9...success
 [+] Handling branch
 maint-0.3.4 Handling branch
   [+] Switching branch to maint-0.3.4...success
   [+] Merging branch origin/maint-0.3.4...success
   [+] Merging branch maint-0.2.9 into maint-0.3.4...success
 [+] Handling branch
 release-0.3.4 Handling branch
   [+] Switching branch to release-0.3.4...success
   [+] Merging branch origin/release-0.3.4...success
   [+] Merging branch maint-0.3.4 into release-0.3.4...success
 [+] Handling branch
 maint-0.3.5 Handling branch
   [+] Switching branch to maint-0.3.5...success
   [+] Merging branch origin/maint-0.3.5...success
   [+] Merging branch maint-0.3.4 into maint-0.3.5...success
 [+] Handling branch
 release-0.3.5 Handling branch
   [+] Switching branch to release-0.3.5...success
   [+] Merging branch origin/release-0.3.5...success
   [+] Merging branch maint-0.3.5 into release-0.3.5...success
 [+] Handling branch
 maint-0.4.0 Handling branch
   [+] Switching branch to maint-0.4.0...success
   [+] Merging branch origin/maint-0.4.0...success
   [+] Merging branch maint-0.3.5 into maint-0.4.0...success
 [+] Handling branch
 release-0.4.0 Handling branch
   [+] Switching branch to release-0.4.0...success
   [+] Merging branch origin/release-0.4.0...success
   [+] Merging branch maint-0.4.0 into release-0.4.0...success
 [+] Handling branch
 master Handling branch
   [+] Switching branch to master...success
   [+] Merging branch origin/master...success
   [+] Merging branch maint-0.4.0 into master...success
 }}}

 It shows no indication that the merging happened only between these tree
 worktrees.

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