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

Re: svn commit: rev 4247 - trunk/subversion/clients/cmdline

From: Ralph Loader <suckfish_at_ihug.co.nz>
Date: 2003-01-04 01:11:02 CET

Hi,

This change seems to be using target2 before it's initialised.

Incremental patch to move the added lines below the assignment to
target2.

Ralph

Index: subversion/clients/cmdline/diff-cmd.c
===================================================================
--- subversion/clients/cmdline/diff-cmd.c (revision 4248)
+++ subversion/clients/cmdline/diff-cmd.c (working copy)
@@ -79,13 +79,6 @@
 
       if (svn_path_is_url (target1))
         {
- if (! svn_path_is_url (target2))
- return svn_error_create
- (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Diffing URL against local path not yet supported; see\n"
- " http://subversion.tigris.org/issues/show_bug.cgi?id=1061\n"
- " for more details.");
-
           /* The form 'svn diff URL1@N URL2@M'. */
 
           /* The @revs have already been parsed out if they were
@@ -102,6 +95,13 @@
           
           target2 = ((const char **) (targets->elts))[1];
           
+ if (! svn_path_is_url (target2))
+ return svn_error_create
+ (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+ "Diffing URL against local path not yet supported; see\n"
+ " http://subversion.tigris.org/issues/show_bug.cgi?id=1061\n"
+ " for more details.");
+
           /* Notice that we're passing DIFFERENT paths to
              svn_client_diff. This is the only use-case which does so! */
           SVN_ERR (svn_client_diff (options,

On Sat, 2003-01-04 at 11:23, kfogel@tigris.org wrote:
> Author: kfogel
> Date: 2003-01-03 16:23:22 -0600 (Fri, 03 Jan 2003)
> New Revision: 4247
>
> Modified:
> trunk/subversion/clients/cmdline/diff-cmd.c
> Log:
> Fix issue #1057.
>
> * subversion/clients/cmdline/diff-cmd.c
> (svn_cl__diff): Punt if target1 is a URL but target2 is not. (New
> issue #1061 is about adding the URL vs working file case.)
>
>
> Modified: trunk/subversion/clients/cmdline/diff-cmd.c
> ==============================================================================
> --- trunk/subversion/clients/cmdline/diff-cmd.c (original)
> +++ trunk/subversion/clients/cmdline/diff-cmd.c Fri Jan 3 16:23:25 2003
> @@ -79,6 +79,13 @@
>
> if (svn_path_is_url (target1))
> {
> + if (! svn_path_is_url (target2))
> + return svn_error_create
> + (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
> + "Diffing URL against local path not yet supported; see\n"
> + " http://subversion.tigris.org/issues/show_bug.cgi?id=1061\n"
> + " for more details.");
> +
> /* The form 'svn diff URL1@N URL2@M'. */
>
> /* The @revs have already been parsed out if they were
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-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 Sat Jan 4 01:11:48 2003

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