# HG changeset patch # User Glenn Morris # Date 1295128296 28800 # Node ID 60871b0684c409cfee02c605a69edfd8e712ec4c # Parent d074b0e8afefda203ed558106cc48b271dea8ed9 * admin/notes/bzr: More on previous. diff -r d074b0e8afef -r 60871b0684c4 admin/notes/bzr --- a/admin/notes/bzr Sat Jan 15 13:47:46 2011 -0800 +++ b/admin/notes/bzr Sat Jan 15 13:51:36 2011 -0800 @@ -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.