[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100186: Comments related to `bzr commit --fixes'.

[Glenn Morris]

------------------------------------------------------------
revno: 100186
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-11-09 20:50:31 -0800
message:
  Comments related to `bzr commit --fixes'.
modified:
  .dir-locals.el
  admin/notes/bugtracker

=== modified file '.dir-locals.el'
--- a/.dir-locals.el    2010-11-08 21:07:41 +0000
+++ b/.dir-locals.el    2010-11-10 04:50:31 +0000
@@ -1,6 +1,8 @@
 ((nil . ((tab-width . 8)
          (fill-column . 70)))
  (c-mode . ((c-file-style . "GNU")))
+ ;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work.
+ ;; See admin/notes/bugtracker.
  (log-edit-mode . ((log-edit-rewrite-fixes
                     " (bug#\\([0-9]+\\))" . "debbugs:\\1")))
  (change-log-mode . ((add-log-time-zone-rule . t)
@@ -8,4 +10,3 @@
                     (bug-reference-url-format . "http://debbugs.gnu.org/%s";)
                     (mode . bug-reference))))
 
-;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd

=== modified file 'admin/notes/bugtracker'
--- a/admin/notes/bugtracker    2010-04-14 02:36:48 +0000
+++ b/admin/notes/bugtracker    2010-11-10 04:50:31 +0000
@@ -449,10 +449,12 @@
 
 ** Bazaar stuff
 
-*** You can use `bzr commit --fixes emacs:123' to mark that a commit fixes
+*** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes
 Emacs bug 123.  You will first need to add a line to your bazaar.conf:
 
-bugtracker_emacs_url = http://debbugs.gnu.org/{id}
+bugtracker_debbugs_url = http://debbugs.gnu.org/{id}
+
+See also log-edit-rewrite-fixes in .dir-locals.el.
 
 Note that all this does is add some metadata to the commit, it doesn't
 actually mark the bug as closed in the tracker.  There seems to be no