This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
The following commit(s) were added to refs/heads/main by this push: new cc704373cb doc: Improve ReleasingTor.md and fix announcement ML cc704373cb is described below
commit cc704373cb64cc176ef33d4b07fa875db62100ea Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Aug 11 11:31:29 2022 -0400
doc: Improve ReleasingTor.md and fix announcement ML
Signed-off-by: David Goulet dgoulet@torproject.org --- doc/HACKING/ReleasingTor.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index f4f1368009..0f26cb5881 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -53,6 +53,12 @@ been merged upstream. (Version bumps apply to `maint`; anything touching the changelog should apply only to `main` or `release`.)
+ When updating the version, it will be on `maint` branches and so to + merge-forward, use `git merge -s ours`. For instance, if merging the + version change of `maint-0.4.5` into `maint-0.4.6`, do on `maint-0.4.6` + this command: `git merge -s ours maint-0.4.5`. And then you can proceed + with a git-merge-forward. + 2. For the ChangeLog and ReleaseNotes, you need to write a blurb at the top explaining a bit the release.
@@ -126,7 +132,7 @@ do the following: If possible, mention in which Tor Browser version (with dates) the release will be in. This usually only applies to the latest stable.
- 4. Inform `tor-talk@lists.torproject.org` with the releasing pointing to + 4. Inform `tor-announce@lists.torproject.org` with the releasing pointing to the Forum. Append the ChangeLog there. We do this until we can automate such post from the forum directly.