From 4ebf3ee11cc2dad00e136acba072782c039ade4b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 15 Jan 2011 13:51:36 -0800 Subject: [PATCH] * admin/notes/bzr: More on previous. --- admin/notes/bzr | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/admin/notes/bzr b/admin/notes/bzr index 440487e916..7a668b13f1 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. -- 2.20.1