diff options
author | Glenn Morris <rgm@gnu.org> | 2011-01-15 13:51:36 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2011-01-15 13:51:36 -0800 |
commit | 4ebf3ee11cc2dad00e136acba072782c039ade4b (patch) | |
tree | b2abe6c6cd8af6be88d00e78e2383571fac343d4 /admin/notes | |
parent | 9aafb22b666bd449386c1d0354da807cb845e4ba (diff) | |
download | emacs-4ebf3ee11cc2dad00e136acba072782c039ade4b.tar.gz |
* admin/notes/bzr: More on previous.
Diffstat (limited to 'admin/notes')
-rw-r--r-- | admin/notes/bzr | 5 |
1 files changed, 5 insertions, 0 deletions
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. |