aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes
diff options
context:
space:
mode:
authorKaroly Lorentey2004-05-08 20:23:10 +0000
committerKaroly Lorentey2004-05-08 20:23:10 +0000
commitf4d07503cab876a7e0eaab4701674f7e7f8279e5 (patch)
tree79e314464b7873a1e763ed7102065957ca0249af /admin/notes
parenta338b7a70881174039ad488d7950041175dad9d0 (diff)
downloademacs-f4d07503cab876a7e0eaab4701674f7e7f8279e5.tar.gz
emacs-f4d07503cab876a7e0eaab4701674f7e7f8279e5.zip
Added branch description to admin/notes/BRANCH.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-160
Diffstat (limited to 'admin/notes')
-rw-r--r--admin/notes/BRANCH35
1 files changed, 22 insertions, 13 deletions
diff --git a/admin/notes/BRANCH b/admin/notes/BRANCH
index 2c343e53f15..20d29f83694 100644
--- a/admin/notes/BRANCH
+++ b/admin/notes/BRANCH
@@ -1,18 +1,27 @@
1This file describes the CVS branch in which it is maintained. 1This file describes the Arch branch in which it is maintained.
2Everything below the line is branch-specific. 2Everything below the line is branch-specific.
3________________________________________________________________________ 3________________________________________________________________________
4 4
5This is the "HEAD" branch, otherwise known as the "trunk". Its primary 5This is the "multi-tty" branch. It contains a version of Emacs that
6purpose is to accumulate changes that are not yet partitioned into a 6is able to create frames on multiple display devices and display
7specific (versioned) release. When people say "use CVS emacs", this is 7types, including multiple tty devices and tty+X combined sessions.
8the branch they are talking about. Likewise, a "cvs checkout" without 8The branch has an enhanced version of emacsclient that is capable of
9the "-r" option results in this branch. 9opening a new Emacs frame on the terminal it runs on.
10 10
11The plans for this branch are not specified; Emacs hackers add to it 11Commit access to the multi-tty branch is only available to its
12relatively free of constraint (aside from proper legal / accounting 12maintainer, Károly LĹ‘rentey (lorentey@elte.hu). The best way to
13practices), although sometimes there is related discussion on the 13contribute to the project is to create your own public Arch branch,
14emacs-devel mailing list. 14and publish your changes there. (I will then be able to easily "pull"
15your changes into the multi-tty branch.)
15 16
16The closure process for this branch is undocumented; concepts such as 17The branch is scheduled for inclusion in the next major release of
17"freeze", "release", or "integration with the trunk" are not applicable 18Emacs, version 22.
18to this branch. 19
20Please read the file README.multi-tty in the base directory for
21details.
22
23
24
25Local Variables:
26coding: utf-8
27End: