RE: svn commit: r36269 - trunk/subversion/libsvn_client

[Bert Huijben <rh...@sharpsvn.net>]

> -----Original Message-----
> From: Hyrum K. Wright [mailto:hyrum@hyrumwright.org]
> Sent: maandag 2 maart 2009 23:24
> To: svn@subversion.tigris.org
> Subject: svn commit: r36269 - trunk/subversion/libsvn_client
> 
> Author: hwright
> Date: Mon Mar  2 14:24:11 2009
> New Revision: 36269
> 
> Log:
> Fix a bug in libsvn_client, uncovered by work on WC-NG.
> 
> * subversion/libsvn_client/commit_util.c
>   (harvest_committables): Make the code match the comments by ensuring
that
>     used_url is always set.  Add a note about WC-NG to the comment.

	Hi,

Should we backport this fix to 1.6.X?

Just yesterday I received a "Entry for 'D:\SRC\SoF_Online\Lua\lua' has no
URL" error from one of the AnkhSVN users and this might be related.

	Bert

> 
> Modified:
>    trunk/subversion/libsvn_client/commit_util.c
> 
> Modified: trunk/subversion/libsvn_client/commit_util.c
> URL:
>
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/commit_util.
c?
> pathrev=36269&r1=36268&r2=36269
>
============================================================================
==
> --- trunk/subversion/libsvn_client/commit_util.c	Mon Mar  2 14:24:03
2009
> 	(r36268)
> +++ trunk/subversion/libsvn_client/commit_util.c	Mon Mar  2 14:24:11
2009
> 	(r36269)
> @@ -731,8 +731,13 @@ harvest_committables(apr_hash_t *committ
> 
>            /* We'll use the entry's URL if it has one and if we aren't
>               in copy_mode, else, we'll just extend the parent's URL
> -             with the entry's basename.  */
> -          if ((! this_entry->url) || (copy_mode))
> +             with the entry's basename.
> +
> +             TODO: Do we even need this conditional with WC-NG?  Aren't
we
> +             always returning the URL in the entry struct? */
> +          if (this_entry->url && !copy_mode)
> +            used_url = entry->url;
> +          else
>              used_url = svn_path_join(url, name_uri, iterpool);
> 
>            /* Recurse. */
> 
> ------------------------------------------------------
>
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=125
85
> 19

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1266092