Commit b9236874 authored by Dan Nicolaescu's avatar Dan Nicolaescu

(vc-bzr-after-dir-status): Match another renaming indicator.

parent c14902e0
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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment