From a4037ec4b3668100c73ef90735c965bc1511d40a Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Thu, 20 Dec 2007 00:22:20 +0100
Subject: rules: New.

---
 hurd.mdwn                     |  1 +
 microkernel/mach/gnumach.mdwn |  1 +
 rules.mdwn                    | 87 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 rules.mdwn

diff --git a/hurd.mdwn b/hurd.mdwn
index bf57c9ba..61329f97 100644
--- a/hurd.mdwn
+++ b/hurd.mdwn
@@ -56,6 +56,7 @@
 
 # Developer References
 
+* [[Rules]]
 * Libraries
   * [[libpager]]
   * [[libstore]]
diff --git a/microkernel/mach/gnumach.mdwn b/microkernel/mach/gnumach.mdwn
index ab35a9de..30073a16 100644
--- a/microkernel/mach/gnumach.mdwn
+++ b/microkernel/mach/gnumach.mdwn
@@ -24,3 +24,4 @@ GNU Mach runs on x86 machines.  See the
 * [[Debugging]]
 * [[Boot_Trace]]
 * [[Projects]]
+    * [[Rules]]
diff --git a/rules.mdwn b/rules.mdwn
new file mode 100644
index 00000000..53810a8c
--- /dev/null
+++ b/rules.mdwn
@@ -0,0 +1,87 @@
+[[meta copyright="Copyright © 2007 Free Software Foundation, Inc."]]
+[[meta license="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled
+[[GNU_Free_Documentation_License|/fdl]]."]]
+
+# Source repositories
+
+CVS repositories on Savannah, see <http://savannah.gnu.org/cvs/?group=hurd>.
+
+## Branches
+
+Members of the Hurd Savannah group,
+<http://savannah.gnu.org/project/memberlist.php?group=hurd>, are allowed to
+create branches without formal permission...
+
+* named *SAVANNAH_LOGIN-WHATEVER-branch* for general-purpose branches, or
+
+* named *BASE_BRANCH-WHATEVER-branch* for topic-branches basing on
+    *BASE_BRANCH*.
+
+*WHATEVER* shall be a suitable tag.
+
+Exaples:
+
+* GNU Mach
+
+    * *gnumach-1-branch-Xen-branch*
+    * *gnumach-1-branch-gdb-branch*
+
+* GNU Hurd
+
+    * *miles-orphaned-changes*
+    * *hammy-libchannel-branch*
+    * *mmenal-soc2006-nfs-branch*
+
+Also, create helper tags for merging mainline changes into your branches.
+
+Exaples:
+
+* GNU Mach
+
+    * *gnumach-1-branch-Xen-branch*: *gnumach-1-branch-Xen-branch-merge_helper*
+    * *gnumach-1-branch-gdb-branch*: *gnumach-1-branch-gdb-branch-merge_helper*
+
+* GNU Hurd
+
+    * *hammy-libchannel-branch*: *hammy-libchannel-branch-base*
+    * *mmenal-soc2006-nfs-branch*: *mmenal-soc2006-nfs-branch-base*
+
+### Merging
+
+Merging between CVS branches is not trivial.  Unless you really know what
+you're doing, please talk to [[Thomas_Schwinge|tschwinge]] or
+[[Samuel_Thibault|samuelthibault]], to avoid cluttering the repositories
+unintendedly.
+
+## Tags
+
+Equivalent rules apply.
+
+## Behavior
+
+Most branches are to be eventually be merged back into the mainline branch.  To
+faciliate (and also to help other contributors) we'd like you to write a short
+summary log in a top-level (or wherever else appropriate) `ChangeLog.WHATEVER`
+file.
+
+Exaples:
+
+* GNU Mach
+
+    * *gnumach-1-branch-Xen-branch*: `ChangeLog.Xen`
+    * *gnumach-1-branch-gdb-branch-merge_helper*: `ChangeLog.gdb`
+
+* GNU Hurd
+
+    * *hammy-libchannel-branch-base*: `channelio/ChangeLog`, `libchannel/ChangeLog`
+    * *mmenal-soc2006-nfs-branch-base*: `nfs/ChangeLog`
+
+This need not be a full-fledged [GNU-style *ChangeLog*
+file](http://www.gnu.org/prep/standards/html_node/Change-Logs.html).  E.g.,
+don't waste time writing *ChangeLog* entries for debugging stuff that will be
+removed again before merging back into mainline.  But please do write
+something.  Short notes.
-- 
cgit v1.2.3