Mercurial > emacs
changeset 107049:6791d69ed71e
(vc-bzr-after-dir-status): Match another renaming indicator.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 29 Jan 2010 15:43:31 -0800 |
| parents | 93f440d162ed |
| children | 193c78de8806 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jan 29 14:14:26 2010 -0500 +++ b/lisp/ChangeLog Fri Jan 29 15:43:31 2010 -0800 @@ -1,3 +1,7 @@ +2010-01-29 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-bzr.el (vc-bzr-after-dir-status): Match another renaming indicator. + 2010-01-29 Chong Yidong <cyd@stupidchicken.com> * dirtrack.el (dirtrack): Warn instead of signalling error if the
--- a/lisp/vc-bzr.el Fri Jan 29 14:14:26 2010 -0500 +++ b/lisp/vc-bzr.el Fri Jan 29 15:43:31 2010 -0800 @@ -679,6 +679,7 @@ ("? " . unregistered) ;; No such state, but we need to distinguish this case. ("R " . renamed) + ("RM " . renamed) ;; For a non existent file FOO, the output is: ;; bzr: ERROR: Path(s) do not exist: FOO ("bzr" . not-found) @@ -713,7 +714,7 @@ (when entry (setf (nth 1 entry) 'conflict)))) ((eq translated 'renamed) - (re-search-forward "R \\(.*\\) => \\(.*\\)$" (line-end-position) t) + (re-search-forward "R[ M] \\(.*\\) => \\(.*\\)$" (line-end-position) t) (let ((new-name (file-relative-name (match-string 2) relative-dir)) (old-name (file-relative-name (match-string 1) relative-dir))) (push (list new-name 'edited