[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 teor):

 Replying to [comment:2 asn]:
 > Yikes, I spoke too soon I think I just did this exact mistake in #29806.
 >
 > Apparently I was experimenting with a merge-forward that was not working
 and left garbage into my `release-0.3.4` worktree (which I should not have
 messed up with in the first place). Then I `git-pull-all.sh` which did not
 complain that `release-0.3.4` is not identical to `origin/release-0.3.4`.
 >
 > So another useful thing would be to establish the assumption that after
 `git-pull-all` all the worktrees are completely synched with upstream?
 Does this work for everyone?

 If there are different PRs for different maint branches, we need to be
 able to merge to multiple maint branches, then merge forward.

 Here's what that session might look like:
 (Using #29806 as an example.)
 1. Reset all trees to origin
 2. Merge PR for maint-0.3.4 into that branch
 3. Merge PR for maint-0.3.5 into that branch
 4. Merge PR for maint-0.4.0 into that branch
 5. Merge forward
   * merge forward does an implicit pull-all, but it must not do a reset
 6. Push all
   * should push-all do an implicit pull-all, to check for conflicts?

 I would also like the reset-all, pull-all, and merge-forward scripts to
 list the branches that were changed, at the end of their output. (push-all
 already lists the pushed branches, using git.)

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