* notes/bzr (Installing changes from gnulib): New section.

Need for this suggested by Stefan Monnier.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6a698728b6cee51de9f6a213e384a4be625e6064..b15d49f9e5071e23c13aa55cc6acef576f194df1 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * notes/bzr (Installing changes from gnulib): New section.
+       Need for this suggested by Stefan Monnier.
+
 2011-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in

diff --git a/admin/notes/bzr b/admin/notes/bzr
index 7a668b13f1c18bf92ce408a24423620a6c227542..0dfad230e5784139b0c322fd0d97531b24b2b627 100644 (file)
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -39,6 +39,27 @@ yet another fun excursion into the exciting world of version control.
 
 http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
 
+* Installing changes from gnulib
+Some of the files in Emacs are copied from gnulib.  To synchronize
+these files from the version of gnulib that you have checked out into
+a sibling directory of your branch, type "make sync-from-gnulib"; this
+will check out the latest version of gnulib if there is no sibling
+directory already.  It is a good idea to run "bzr status" afterwards,
+so that if a gnulib module added a file, you can record the new file
+using "bzr add".  After synchronizing from gnulib, do a "make" in the
+usual way.
+
+To change the set of gnulib modules, change the GNULIB_MODULES
+variable in the top-level Makefile.in, and then run:
+
+  ./config.status
+  make sync-from-gnulib
+  bzr status
+
+The last command will mention files that may need to be added using
+"bzr add".  If you remove a gnulib module, or if a gnulib module
+removes a file, then remove the corresponding files by hand.
+
 * How to merge changes from emacs-23 to trunk
 
 The following description uses bound branches, presumably it works in