[Emacs-diffs] /srv/bzr/emacs/trunk r99416: (vc-bzr-after-dir-status): Match another renaming indicator.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99416
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-29 15:43:31 -0800
message:
  (vc-bzr-after-dir-status): Match another renaming indicator.
modified:
  lisp/ChangeLog
  lisp/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-29 19:08:09 +0000
+++ b/lisp/ChangeLog    2010-01-29 23:43:31 +0000
@@ -1,3 +1,7 @@
+2010-01-29  Dan Nicolaescu  <address@hidden>
+
+       * vc-bzr.el (vc-bzr-after-dir-status): Match another renaming indicator.
+
 2010-01-29  Chong Yidong  <address@hidden>
 
        * dirtrack.el (dirtrack): Warn instead of signalling error if the

=== modified file 'lisp/vc-bzr.el'
--- a/lisp/vc-bzr.el    2010-01-25 06:03:23 +0000
+++ b/lisp/vc-bzr.el    2010-01-29 23:43:31 +0000
@@ -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