This patch makes vc-svn parse the output of svn status -v correctly when a
file has been merged from somewhere else.
[[
Make vc-svn parse the output of svn status -v correctly when a file has been
merged but not yet committed. It then has a valid last-committed revision but
not a working-copy revision; treat it as newly added file.
* contrib/client-side/vc-svn.el
(vc-svn-parse-status): Make regexp more tolerant of last-committed revision.
]]
Index: contrib/client-side/vc-svn.el
===================================================================
--- contrib/client-side/vc-svn.el (revision 18909)
+++ contrib/client-side/vc-svn.el (working copy)
@@ -190,7 +190,7 @@
(cond
((not state) nil)
;; A newly added file has no revision.
- ((looking-at "....\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\?")
+ ((looking-at "....\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\(\\?\\|[0-9]+\\)")
(list state "0" nil))
((looking-at "....\\s-+\\(\\*\\s-+\\)?\\([0-9]+\\)\\s-+\\([0-9]+\\)")
(list state
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Mar 19 16:57:47 2006