From: Glenn Morris <rgm@gnu.org>
Date: Sat, 15 Jan 2011 21:51:36 +0000 (-0800)
Subject: * admin/notes/bzr: More on previous.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~230^2~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ebf3ee11cc2dad00e136acba072782c039ade4b;p=emacs.git

* admin/notes/bzr: More on previous.
---

diff --git a/admin/notes/bzr b/admin/notes/bzr
index 440487e9160..7a668b13f1c 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -67,3 +67,8 @@ You can commit either before you do this (eg if you had a lot of
 conflicts to resolve and don't want to get confused), or refrain from
 committing until bzrmerge has merged all revisions.
 
+Before committing, check bzr status and bzr diff output.
+
+Note that ChangeLog entries are automatically merged to the top with
+today's date, but you still might want to check them to see that too
+much is not being included.