diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-01-29 15:43:31 -0800 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-01-29 15:43:31 -0800 |
| commit | 800f30141016d6751762dc3c33da050b04d135bc (patch) | |
| tree | 0aa8af8639c8eee6788110b29fa219eba47286b9 | |
| parent | 4bf9cf31485af6cf6d1da5ed34695fa26063b70c (diff) | |
| download | emacs-800f30141016d6751762dc3c33da050b04d135bc.tar.gz | |
(vc-bzr-after-dir-status): Match another renaming indicator.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2ec6ba372a3..66d03129672 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 8861fef0388..5f01d297971 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -679,6 +679,7 @@ stream. Standard error output is discarded." ("? " . 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 @@ stream. Standard error output is discarded." (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 |