aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorStefan Monnier2013-08-29 15:20:42 -0400
committerStefan Monnier2013-08-29 15:20:42 -0400
commit7763d67c87ae050d4e7cc28f1e0c4b14df037d2e (patch)
treec13da3622165115b7e2eb70ea1372f842d2ef243 /admin
parent2da4c3ab6f9f2caf026e03c42e74ccd1f1c86c25 (diff)
downloademacs-7763d67c87ae050d4e7cc28f1e0c4b14df037d2e.tar.gz
emacs-7763d67c87ae050d4e7cc28f1e0c4b14df037d2e.zip
* admin/notes/elpa: Update to the new Git setup.
Diffstat (limited to 'admin')
-rw-r--r--admin/notes/elpa25
1 files changed, 11 insertions, 14 deletions
diff --git a/admin/notes/elpa b/admin/notes/elpa
index db14456fe32..469a0ca8bd1 100644
--- a/admin/notes/elpa
+++ b/admin/notes/elpa
@@ -1,24 +1,21 @@
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 a Bzr 3The GNU Emacs package archive, at elpa.gnu.org, is managed using a Git
4branch named "elpa", hosted on Savannah. To check it out: 4repository 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 git clone git://bzr.sv.gnu.org/emacs/elpa
7 cd elpa 7 cd elpa
8 echo "public_branch = bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa" >> .bzr/branch/branch.conf 8 git remote set-url --push origin git+ssh://bzr.sv.gnu.org/srv/git/emacs/elpa
9 bzr bind bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/elpa
10 [create task branch for edits, etc.] 9 [create task branch for edits, etc.]
11 10
12Changes to this branch propagate to elpa.gnu.org in a semi-manual way. 11Changes to this branch propagate to elpa.gnu.org via a "deployment" script run
13There exists a copy of the elpa branch on that machine. Someone with 12daily. This script (which is kept in elpa/admin/update-archive.sh) generates
14access logs in, pulls the latest changes from Savannah, and runs a 13the content visible at http://elpa.gnu.org/packages.
15"deployment" script. This script (which is itself kept in the Bzr
16branch) generates the content visible at http://elpa.gnu.org/packages.
17 14
18The reason we set things up this way, instead of using the package 15A new package is released as soon as the "version number" of that package is
19upload commands in package-x.el, is to let Emacs hackers conveniently 16changed. So you can use `elpa' to work on a package without fear of releasing
20edit the contents of the "elpa" branch. (In particular, multi-file 17those changes prematurely. And once the code is ready, just bump the
21packages are stored on the branch in source form, not as tarfiles.) 18version number to make a new release of the package.
22 19
23It is easy to use the elpa branch to deploy a "local" copy of the 20It is easy to use the elpa branch to deploy a "local" copy of the
24package archive. For details, see the README file in the elpa branch. 21package archive. For details, see the README file in the elpa branch.