Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
4775ecad
Commit
4775ecad
authored
Feb 05, 2010
by
Dan Nicolaescu
Browse files
* vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
parent
0d17c4b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/vc-bzr.el
lisp/vc-bzr.el
+6
-2
No files found.
lisp/ChangeLog
View file @
4775ecad
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):
...
...
lisp/vc-bzr.el
View file @
4775ecad
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment