Mercurial > emacs

changeset 107097:6692a4cd2966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 05 Feb 2010 20:23:59 -0800
parents 31db1aaeac2d
children 17f07853dd4d
files lisp/ChangeLog lisp/vc-bzr.el
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Feb 06 00:36:20 2010 +0200
+++ b/lisp/ChangeLog	Fri Feb 05 20:23:59 2010 -0800
@@ -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):
--- a/lisp/vc-bzr.el	Sat Feb 06 00:36:20 2010 +0200
+++ b/lisp/vc-bzr.el	Fri Feb 05 20:23:59 2010 -0800
@@ -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