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

Re: svn diff; vc-svn-diff in vc-svn.el

From: Karl Chen <quarl_at_hkn.eecs.berkeley.edu>
Date: 2003-04-12 23:33:04 CEST

It turns out Emacs 21.4 (in development) changed (from 21.2) the
vc-diff-switches-list list function so that you would pass 'svn
instead of svn. So it's not an issue yet but when Emacs 21.4 is
released you'll need to add a wrapper that checks the Emacs version
(ugly). Or you could (defvar svn 'svn) as a kludge.


>>>>> "kfogel" == Karl Fogel <kfogel@newton.ch.collab.net> writes:

    kfogel> Karl Chen <quarl@hkn.eecs.berkeley.edu> writes:
>> Also a typo in vc-svn.el prevents the vc-svn-diff function from
>> being used at all even though the diff switches are ignored by
>> the function and then possibly svn itself.
>> --- vc-svn.el (revision 5495)
>> +++ vc-svn.el (working copy)
>> @@ -280,11 +280,11 @@
>> workfile contents as the newer version.
>> This function returns a status of either 0 (no differences found), or
>> 1 (either non-empty diff or the diff is run asynchronously)."
>> - (let* ((diff-switches-list (vc-diff-switches-list svn))
>> + (let* ((diff-switches-list (vc-diff-switches-list 'svn))
>> (status (vc-svn-run-status file))
>> (local (elt status 1))

    kfogel> The code works for me without this patch;
    kfogel> `vc-diff-switches-list' is a macro not a function.

    kfogel> What was the error you were getting?

Karl Chen / quarl@quarl.org
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Apr 12 23:33:47 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.