mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* admin/notes/bzr: Mention the helpful changelog_merge plugin.

Browse source
This commit is contained in:
Glenn Morris 2011-02-12 15:43:42 -08:00
parent 7b24e97ab5
commit d0ba09dcd8
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
admin/notes/bzr
View file

@ -65,11 +65,26 @@ 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:
cd ~/.bazaar/plugins
bzr branch lp:bzr-changelog-merge
mv bzr-changelog-merge changelog_merge
This will make merging ChangeLogs a lot smoother. It merges new
entries to the top of the file, rather than trying to fit them in
mid-way through.
1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
Check for any uncommitted changes with bzr status.
2) M-x cd /path/to/trunk
The first time only, do this:
cd .bzr/branch
Add the following line to branch.conf:
changelog_merge_files = ChangeLog
3) load admin/bzrmerge.el
4) M-x bzrmerge RET /path/to/emacs-23 RET