[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Make vc-svn.el more tolerant

From: <kfogel_at_collab.net>
Date: 2006-03-22 15:31:47 CET

"Mattias Engdegård" <mattias@virtutech.se> writes:
> This patch makes vc-svn parse the output of svn status -v correctly when a
> file has been merged from somewhere else.

We don't maintain vc-svn.el here anymore; the current file in our
working copy contains just this:

   ;; This file no longer lives here, it lives in FSF Emacs.
   (error
    "http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/vc-svn.el
     is the new canonical location of vc-svn.el, in the FSF Emacs tree.")

Best,
-Karl

-- 
www.collab.net  <>  CollabNet  |  Distributed Development On Demand
> [[
> 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
> 
> 
-- 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 22 17:25:13 2006

This is an archived mail posted to the Subversion Dev mailing list.