Mercurial > emacs
changeset 106754:b6846b19b0db
Merge from trunk
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 06 Jan 2010 17:04:19 +0100 |
| parents | 10b9609fb6b7 (current diff) 06b47f571086 (diff) |
| children | 574dd89b7759 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jan 06 17:03:26 2010 +0100 +++ b/lisp/ChangeLog Wed Jan 06 17:04:19 2010 +0100 @@ -1,3 +1,7 @@ +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
--- a/lisp/vc-bzr.el Wed Jan 06 17:03:26 2010 +0100 +++ b/lisp/vc-bzr.el Wed Jan 06 17:04:19 2010 +0100 @@ -671,7 +671,6 @@ ;; 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 @@ ;; 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))