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
ea2b370d
Commit
ea2b370d
authored
Jan 06, 2010
by
Jan Djärv
Browse files
Merge from trunk
parents
42707278
4f6fc252
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/vc-bzr.el
lisp/vc-bzr.el
+2
-1
No files found.
lisp/ChangeLog
View file @
ea2b370d
2010-01-06 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-after-dir-status): Ignore pending merges.
2010-01-05 Tom Tromey <tromey@redhat.com>
* progmodes/python.el (python-font-lock-keywords): Handle
...
...
lisp/vc-bzr.el
View file @
ea2b370d
...
...
@@ -671,7 +671,6 @@ stream. Standard error output is discarded."
;; For conflicts, should we list the .THIS/.BASE/.OTHER?
("
C
" . conflict)
("
?
" . unregistered)
("
?
" . unregistered)
;; No such state, but we need to distinguish this case.
("
R
" . renamed)
;; For a non existent file FOO, the output is:
...
...
@@ -683,6 +682,8 @@ stream. Standard error output is discarded."
;; FIXME: maybe this warning can be put in the vc-dir header...
("
wor
" . not-found)
;; Ignore "
P
" and "
P.
" for pending patches.
("
P
" . not-found)
("
P.
" . not-found)
))
(translated nil)
(result nil))
...
...
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