[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [bridgedb/main] Remove the git workflow and update old trac links
commit 4ef284f2ab89bb5511392ce32df239025801567d
Author: meskio <meskio@xxxxxxxxxxxxxx>
Date: Wed May 12 13:27:01 2021 +0200
Remove the git workflow and update old trac links
We don't follow the git workflow it anymore. We do use only main and
feature branches.
---
doc/HACKING.md | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/doc/HACKING.md b/doc/HACKING.md
index 7e76a9b..449b3d1 100644
--- a/doc/HACKING.md
+++ b/doc/HACKING.md
@@ -4,10 +4,9 @@
HACKING
=======
-Hack on whatever you like. Ticket are [here][trac]. If you're doing something
-big that doesn't have a ticket, you should probably make one. If you don't
-want to register for a Trac account, you can use the ```cypherpunks``` account
-with password ```writecode```.
+Hack on whatever you like. Issues are [here][issues]. If you're doing something
+big that doesn't have a ticket, you should probably make one. If you don't have
+an account you can [request an account][gitlab accounts]
## Generating bridge descriptors
@@ -22,16 +21,6 @@ Ideally, even more descriptors should be generated, somewhere in the realm of
2000, as certain bugs do not emerge until BridgeDB is processing thousands of
descriptors.
-## Git Workflow
-
-See this article on git branching [workflow][workflow]. The only modifications
-we make are:
-
- * Tagging is done in the ```release-*``` branches, rather than in master.
- * It's okay to use either the ```feature/*``` and ```fix/*``` branch naming
- scheme, or follow little-t Tor's branch naming scheme,
- i.e. ```bug666-description-r1```.
-
## Making a release
### Updating dependencies
@@ -82,6 +71,6 @@ tagged release at that point, i.e.:
References
----------
-[trac]: https://trac.torproject.org/projects/tor/query?status=!closed&component=Circumvention%2FBridgeDB
-[workflow]: https://nvie.com/posts/a-successful-git-branching-model/
+[issues]: https://gitlab.torproject.org/tpo/anti-censorship/bridgedb/-/issues
+[gitlab accounts]: https://gitlab.onionize.space/
[pur]: https://pypi.org/project/pur/
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits