summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--admin/ChangeLog4
-rw-r--r--admin/notes/BRANCH18
2 files changed, 22 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index cca47783b6..d0cc63f1e9 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-08 Thien-Thi Nguyen <ttn@gnu.org>
+
+ * notes/BRANCH: New file, to be maintained per CVS branch.
+
2003-10-01 Miles Bader <miles@gnu.org>
* quick-install-emacs: Don't use "function" keyword when defining
diff --git a/admin/notes/BRANCH b/admin/notes/BRANCH
new file mode 100644
index 0000000000..2c343e53f1
--- /dev/null
+++ b/admin/notes/BRANCH
@@ -0,0 +1,18 @@
+This file describes the CVS branch in which it is maintained.
+Everything below the line is branch-specific.
+________________________________________________________________________
+
+This is the "HEAD" branch, otherwise known as the "trunk". Its primary
+purpose is to accumulate changes that are not yet partitioned into a
+specific (versioned) release. When people say "use CVS emacs", this is
+the branch they are talking about. Likewise, a "cvs checkout" without
+the "-r" option results in this branch.
+
+The plans for this branch are not specified; Emacs hackers add to it
+relatively free of constraint (aside from proper legal / accounting
+practices), although sometimes there is related discussion on the
+emacs-devel mailing list.
+
+The closure process for this branch is undocumented; concepts such as
+"freeze", "release", or "integration with the trunk" are not applicable
+to this branch.