aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes
diff options
context:
space:
mode:
authorPaul Eggert2011-03-13 10:28:15 -0700
committerPaul Eggert2011-03-13 10:28:15 -0700
commit3eca4629203c3038f04db312999ca32d8e292e50 (patch)
tree7dab20a2f6de3e300fd266f51b71efd1d9f52188 /admin/notes
parent01e0b5adf4e35c2b00705c212b853936fe218cac (diff)
parentd32df629a23d0e04eb70df9c6e60e821d905c822 (diff)
downloademacs-3eca4629203c3038f04db312999ca32d8e292e50.tar.gz
emacs-3eca4629203c3038f04db312999ca32d8e292e50.zip
Merge from mainline.
Diffstat (limited to 'admin/notes')
-rw-r--r--admin/notes/elpa32
1 files changed, 16 insertions, 16 deletions
diff --git a/admin/notes/elpa b/admin/notes/elpa
index cbea8cc1dfa..db14456fe32 100644
--- a/admin/notes/elpa
+++ b/admin/notes/elpa
@@ -1,24 +1,24 @@
1NOTES ON THE EMACS PACKAGE ARCHIVE 1NOTES ON THE EMACS PACKAGE ARCHIVE
2 2
3The GNU Emacs package archive, at elpa.gnu.org, is managed using Bzr. 3The GNU Emacs package archive, at elpa.gnu.org, is managed using a Bzr
4The Bzr branch is hosted on Savannah, and you can check it out with 4branch named "elpa", hosted on Savannah. To check it out:
5 5
6 bzr branch bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa elpa 6 bzr branch bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa elpa
7 cd elpa
8 echo "public_branch = bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa" >> .bzr/branch/branch.conf
9 bzr bind bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/elpa
10 [create task branch for edits, etc.]
7 11
8Changes made to this branch propagate to elpa.gnu.org as follows. 12Changes to this branch propagate to elpa.gnu.org in a semi-manual way.
9There exists a copy of the elpa branch on that machine. Someone with 13There exists a copy of the elpa branch on that machine. Someone with
10access must log in, pull the latest changes from Savannah, and run a 14access logs in, pulls the latest changes from Savannah, and runs a
11"deployment" script that generates the content at the web-visible 15"deployment" script. This script (which is itself kept in the Bzr
12location http://elpa.gnu.org/packages. 16branch) generates the content visible at http://elpa.gnu.org/packages.
13 17
14The reason things are set up this way, instead of using the package 18The reason we set things up this way, instead of using the package
15upload utilities in package-x.el, is so that Emacs hackers can easily 19upload commands in package-x.el, is to let Emacs hackers conveniently
16edit the contents of the Savannah "elpa" branch, with the aid of 20edit the contents of the "elpa" branch. (In particular, multi-file
17version control. (For instance, multi-file packages are stored on the 21packages are stored on the branch in source form, not as tarfiles.)
18Bzr branch in source form, not as tarfiles.) Because deployment is a
19semi-manual process, this allows us some flexibility in making changes
20to the branch on Savannah. Furthermore, one can use the elpa branch
21to deploy a "local" copy of the package archive, for testing.
22 22
23For details on how to use the elpa branch, see that README file in 23It is easy to use the elpa branch to deploy a "local" copy of the
24that branch. 24package archive. For details, see the README file in the elpa branch.