From: Glenn Morris <rgm@gnu.org>
Date: Wed, 10 Nov 2010 04:50:31 +0000 (-0800)
Subject: Comments related to `bzr commit --fixes'.
X-Git-Tag: emacs-pretest-23.2.91~49^2~55
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de4708cbd8ec2185efcad0b20f3e2766f4b95e23;p=emacs.git

Comments related to `bzr commit --fixes'.
---

diff --git a/.dir-locals.el b/.dir-locals.el
index 3ab6809ffb8..9b907570663 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -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
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 5936eead85a..e22a8e5947e 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -449,10 +449,12 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 
 ** 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