HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9aafb22
)
* admin/notes/bzr: More on previous.
author
Glenn Morris
<rgm@gnu.org>
Sat, 15 Jan 2011 21:51:36 +0000
(13:51 -0800)
committer
Glenn Morris
<rgm@gnu.org>
Sat, 15 Jan 2011 21:51:36 +0000
(13:51 -0800)
admin/notes/bzr
patch
|
blob
|
blame
|
history
diff --git
a/admin/notes/bzr
b/admin/notes/bzr
index
440487e
..
7a668b1
100644
(file)
--- 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.