[Emacs-diffs] /srv/bzr/emacs/trunk r99459: * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99459
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-05 20:23:59 -0800
message:
  * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
modified:
  lisp/ChangeLog
  lisp/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-05 22:36:20 +0000
+++ b/lisp/ChangeLog    2010-02-06 04:23:59 +0000
@@ -1,3 +1,7 @@
+2010-02-06  Dan Nicolaescu  <address@hidden>
+
+       * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges 
header.
+
 2010-02-05  Juri Linkov  <address@hidden>
 
        * doc-view.el (doc-view-mode):

=== modified file 'lisp/vc-bzr.el'
--- a/lisp/vc-bzr.el    2010-02-01 04:58:35 +0000
+++ b/lisp/vc-bzr.el    2010-02-06 04:23:59 +0000
@@ -796,8 +796,12 @@
        (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