* vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7edff434fffdc635514b62493add49f38d301664..a3808b5a2ff55ee95a27b63cdab39826fe0a8eb7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
+
 2010-02-05  Juri Linkov  <juri@jurta.org>
 
        * doc-view.el (doc-view-mode):

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 1b0206ce70c0e82c83bf1ff35071628810e04432..efeb19de4c7665fb1d91d2807b25e85626f032a4 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -796,8 +796,12 @@ stream.  Standard error output is discarded."
        (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves")
        (root-dir (vc-bzr-root dir))
        (pending-merge
-       (file-exists-p
-        (expand-file-name ".bzr/checkout/merge-hashes" root-dir)))
+       ;; FIXME: looking for .bzr/checkout/merge-hashes is not a
+       ;; reliable method to detect pending merges, disable this
+       ;; until a proper solution is implemented.
+       (and nil
+        (file-exists-p
+        (expand-file-name ".bzr/checkout/merge-hashes" root-dir))))
        (pending-merge-help-echo
        (format "A merge has been performed.\nA commit from the top-level directory (%s)\nis required before being able to check in anything else" root-dir))
        (light-checkout