Skip to content

GitLab

Trac
Trac

GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Closed (moved)
Opened by George Kadianakis@asn

git-maintainance-scripts: merge-forward should provide indications of merges actually occuring

I'd like the merge-forward script (see #29391 (moved)) to highlight me the merge-forwards that actually merged something, contrary to the ones that were NOPs.

My fear is that I will have left some garbage in my worktrees and a merge-forward will merge forward something that I have not anticipated (e.g. from 035 to 040, when I just wanted to merge-fwd from 040 to master).

This has not yet happened, but I'd like as much protection as possible when using these automatic tools :)

To upload designs, you'll need to enable LFS and have admin enable hashed storage. More information