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

Re: Fix for issue 3620 - unlock command

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 3 Nov 2010 21:12:41 +0100

On Thu, Nov 04, 2010 at 01:33:37AM +0530, Noorul Islam K M wrote:
> Modified log message for the patch.
>
> Log
>
> [[[
>
> Make 'svn unlock' verify that both working copy paths and URLs are
> not passed.
>
> * subversion/tests/cmdline/input_validation_tests.py
> (invalid_unlock_targets): New test, verifying that svn unlock copes well
> with invalid target combinations.
>
> * subversion/svn/unlock-cmd.c
> (svn_cl__unlock): For consistency with other sub-commands, raise the
> SVN_ERR_CL_ARG_PARSING_ERROR if both working copy paths and URLs are
> passed, and use the same error message also used elsewhere.
>
> Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
>
> ]]]
>
> Thanks and Regards
> Noorul

Hi Noorul,

_Without_ your patch, I get:

$ svn lock blah ^/
subversion/libsvn_client/cmdline.c:330: (apr_err=235000)
svn: In file 'subversion/libsvn_subr/dirent_uri.c' line 1649: assertion failed (! svn_path_is_url(relative))
Abort trap (core dumped)

Looks like we also need to catch this condition in libsvn_client,
not just in the command line client.

Stefan
Received on 2010-11-03 21:13:33 CET

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