[Emacs-diffs] /srv/bzr/emacs/trunk r102857: * admin/notes/bzr: More on previous.

[Glenn Morris]

------------------------------------------------------------
revno: 102857
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-15 13:51:36 -0800
message:
  * admin/notes/bzr: More on previous.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-01-15 21:47:46 +0000
+++ b/admin/notes/bzr   2011-01-15 21:51:36 +0000
@@ -67,3 +67,8 @@
 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.