# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1264808611 28800
# Node ID 6791d69ed71e057e30232afb1775a8a8534cb621
# Parent  93f440d162edb8103b71e63f533178bec443456d
(vc-bzr-after-dir-status): Match another renaming indicator.

diff -r 93f440d162ed -r 6791d69ed71e lisp/ChangeLog
--- 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
diff -r 93f440d162ed -r 6791d69ed71e lisp/vc-bzr.el
--- 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