Commit 9092d186 authored by Paul Eggert's avatar Paul Eggert

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

Need for this suggested by Stefan Monnier.
parent 41f44310
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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment