# HG changeset patch
# User Georges Racinet <georges.racinet@octobus.net>
# Date 1589382965 -7200
#      Wed May 13 17:16:05 2020 +0200
# Node ID a076a7ec9cde906fe4c0aa33538012298f6dfc28
# Parent  3483dccd45a514a0a7cf11465727512300fa8436
CONTRIBUTING: updated for current project structure

These predated the move to Heptapod, having a few outdated parts.
Sending patches to Google Groups is not deprecated.

Less personal style in general.

diff --git a/CONTRIBUTING b/CONTRIBUTING
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1,8 +1,9 @@
 The short version:
  * Patches should have a good summary line for first line of commit message
- * Patches should be sent to the Google Group[0]
+ * Patch series should be sent primarily as Merge Requests[1] or to the
+   Google Group[0]
  * Patch needs to do exactly one thing
- * testsuite passes
+ * test suite passes (enforced by continuous integration)
 
 The longer version:
 
@@ -10,11 +11,10 @@
 system. https://www.mercurial-scm.org/wiki/ContributingChanges contains
 their full guidelines. Key differences are (by rule number):
 
- 1. For hg-git, I'm not strict about the "topic: a few words" format
-    for the first line, but I do insist on a sensible summary as the
-    first line of your commit
- 2. We don't require use of issueNNN for bug fixes (we have no robot)
- 3. Use the hg-git google group
+ 1. For hg-git, we're not strict about the "topic: a few words" format
+    for the first line, but do insist on a sensible summary as the
+    first commit line
+ 2. You can cross-reference Heptapod issues in the #NNN format
  10. We use mostly pep8 style. The current codebase is a mess, but new
      code should be basically pep8.
 
@@ -22,7 +22,14 @@
 Mailing list: hg-git@googlegroups.com
 Archives: https://groups.google.com/forum/#!forum/hg-git
 
-Pull requests are generally not noticed more than once every few
-months. If you do a pull request, I'm still going to expect you to
-have a clean history, and to be willing to rework history so it's
-clean before I push the "merge" button.
+1:
+The project is hosted at https://foss.heptapod.net/mercurial/hg-git
+
+To submit a Merge Request, please ask for Developer rights using the
+'Request access' link. Then, following the instructions of the following
+tutorial should be enough:
+https://heptapod.net/pages/quick-start-guide.html
+
+If you do a Merge Request, we're still going to expect you to
+provide a clean history, and to be willing to rework history so it's
+clean before we push the "merge" button.