X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/db0406bb64f7e5dceeb257c7e350f1e80ed9c1c1..d8ad4d3ff9dcea9c581d72e1e9ec292ea18673b1:/admin/notes/bzr

diff --git a/admin/notes/bzr b/admin/notes/bzr
index 8720982e0a..50eaf3710e 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -72,18 +72,20 @@ removes a file, then remove the corresponding files by hand.
 The following description uses bound branches, presumably it works in
 a similar way with unbound ones.
 
-0) (First time only) Get the bzr changelog_merge plugin
-(this will be included by default in bzr 2.4 onwards):
+0) (This step is only necessary if using bzr older than 2.4.0.)
+Get the bzr changelog_merge plugin:
 
 cd ~/.bazaar/plugins
-bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk 
-mv trunk changelog_merge
+bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk changelog_merge
 
-This should make merging ChangeLogs smoother.  It merges new entries
-to the top of the file, rather than trying to fit them in mid-way
-through.  Newer versions of the plugin should also be able to deal
-with changes to *old* ChangeLog entries, that should not be floated to
-the head of the file (see launchpad#723968).
+This plugin should make merging ChangeLogs smoother.  It merges new
+entries to the top of the file, rather than trying to fit them in
+mid-way through.  Newer versions of the plugin should also be able to
+deal with changes to *old* ChangeLog entries, that should not be
+floated to the head of the file (see launchpad#723968).
+
+It is included in bzr from 2.4.0 onwards, so remember to delete the
+copy in ~/.bazaar if you upgrade bzr.
 
 Maybe the default Emacs behavior without this plugin is better,
 though, it's not clear yet.
@@ -171,7 +173,7 @@ This restores file, but without its history (`bzr log file' will be
 very short).  This is because file gets re-added with a new file-id
 (use `bzr file-id file' to see the id).
 
-Insteading of adding the file, try:
+Instead of adding the file, try:
 
 bzr revert -rN file; bzr commit
 
@@ -179,3 +181,24 @@ where revision N+1 is the one where file was removed.
 
 You could also try `bzr add --file-ids-from', if you have a copy of
 another branch where file still exists.
+
+* Loggerhead
+
+Loggerhead is the bzr tool for viewing a repository over http (similar
+to ViewVC).  The central version is at http://bzr.savannah.gnu.org/lh/emacs,
+but if you just like the way this interface presents data, then if
+you have your own copy of the repository, you can operate your own
+Loggerhead server in stand-alone mode, and so help to reduce the load
+on Savannah:
+
+  bzr branch lp:loggerhead ~/.bazaar/plugins/loggerhead
+  cd /path/to/emacs/bzr
+  bzr serve --http
+
+You may need to install some Python dependencies to get this command to work.
+For example, on RHEL6 I needed:
+
+  yum install python-paste python-simplejson
+  yum --enablerepo=epel install python-simpletal
+
+Then point your web-browser to http://127.0.0.1:8080/ .