diff options
| author | Paul Eggert | 2011-01-17 14:11:13 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 14:11:13 -0800 |
| commit | 9092d18633d982f1d0f514fb6fb975120cb3a472 (patch) | |
| tree | 7708d0470a676eaa592999bfa3974c9e9181f92b /admin/notes | |
| parent | 41f44310b35b8246475d707b3417e42a03b1ca05 (diff) | |
| download | emacs-9092d18633d982f1d0f514fb6fb975120cb3a472.tar.gz emacs-9092d18633d982f1d0f514fb6fb975120cb3a472.zip | |
* notes/bzr (Installing changes from gnulib): New section.
Need for this suggested by Stefan Monnier.
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/bzr | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index 7a668b13f1c..0dfad230e57 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr | |||
| @@ -39,6 +39,27 @@ yet another fun excursion into the exciting world of version control. | |||
| 39 | 39 | ||
| 40 | http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html | 40 | http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html |
| 41 | 41 | ||
| 42 | * Installing changes from gnulib | ||
| 43 | Some of the files in Emacs are copied from gnulib. To synchronize | ||
| 44 | these files from the version of gnulib that you have checked out into | ||
| 45 | a sibling directory of your branch, type "make sync-from-gnulib"; this | ||
| 46 | will check out the latest version of gnulib if there is no sibling | ||
| 47 | directory already. It is a good idea to run "bzr status" afterwards, | ||
| 48 | so that if a gnulib module added a file, you can record the new file | ||
| 49 | using "bzr add". After synchronizing from gnulib, do a "make" in the | ||
| 50 | usual way. | ||
| 51 | |||
| 52 | To change the set of gnulib modules, change the GNULIB_MODULES | ||
| 53 | variable in the top-level Makefile.in, and then run: | ||
| 54 | |||
| 55 | ./config.status | ||
| 56 | make sync-from-gnulib | ||
| 57 | bzr status | ||
| 58 | |||
| 59 | The last command will mention files that may need to be added using | ||
| 60 | "bzr add". If you remove a gnulib module, or if a gnulib module | ||
| 61 | removes a file, then remove the corresponding files by hand. | ||
| 62 | |||
| 42 | * How to merge changes from emacs-23 to trunk | 63 | * How to merge changes from emacs-23 to trunk |
| 43 | 64 | ||
| 44 | The following description uses bound branches, presumably it works in | 65 | The following description uses bound branches, presumably it works in |