4 files changed, 41 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 690689012b0..dc9d4934f04 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen: Fix sed bug that was losing the last AUTOGEN_VCS.
+
 2014-01-04  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (manual-html-fix-node-div): Handle Texinfo 5's movable <hr>.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 8470e7151c9..8b6bddbbd2f 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -218,7 +218,6 @@ xresources.texi   cyd
 ** Check the Lisp manual.
 
 abbrevs.texi      rgm
-advice.texi       cyd
 anti.texi         rgm
 back.texi         rgm
 backups.texi      cyd
diff --git a/admin/notes/bzr b/admin/notes/bzr
index d3886abfd69..a3a125cd675 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -364,3 +364,37 @@ works), or by adding an entry to ~/.bazaar/locations.conf:
 
 You have to use locations.conf rather than bazaar.conf because the
 latter has a lower priority than branch.conf.
+
+* Using git-bzr
+
+** initially
+
+You can use Git locally to talk to the Bazaar repo as a "remote" repo
+via git-bzr (aka git-remote-bzr).  Initial clone:
+
+ git clone bzr::bzr+ssh://USER@bzr.sv.gnu.org/emacs/trunk e
+
+This creates the working dir e/ (with subdir .git, etc).  Disk usage
+is 13G (as of early 2014), so you will probably want to repack:
+
+ git repack -a -d -f --window=250 --depth=250 --window-memory=N
+
+where N is chosen to avoid swapping.  E.g., given 512MB RAM, N="200m"
+results in "du -sh .git" => 559M, about double the smallest reported
+value (obtained with "deprecated" command "git gc --aggressive").
+
+** steady-state
+
+Use "fetch", "pull" and other remote-to-local commands as usual.
+
+For "push", the Emacs Bazaar repo is configured with
+
+ append_revisions_only = True
+
+so some versions of git-remote-bzr may raise AppendRevisionsOnlyViolation
+(in func do_export) instead of displaying a "non fast-forward" message
+and skipping the branch.  See:
+
+ http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00436.html
+
+which includes a provisional patch to git-remote-bzr to do that.
diff --git a/admin/update_autogen b/admin/update_autogen
index 171674fb784..02b15c3aaa1 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -317,8 +317,9 @@ EOF
 
 echo "Finding loaddef targets..."
 
-sed -n -e '/^AUTOGEN_VCS/,/^$/ s/\\//p' lisp/Makefile.in | \
-    sed '/AUTOGEN_VCS/d' >| $tempfile || die "sed error"
+sed -n -e '/^AUTOGEN_VCS/,/^$/p' lisp/Makefile.in | \
+    sed -e '/AUTOGEN_VCS/d' -e '/^$/d' -e 's/\\//' \
+    >| $tempfile || die "sed error"
 
 genfiles=