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

 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?

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