You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/08/07 17:31:52 UTC
Re: svn commit: r38331 - trunk/subversion/libsvn_client
On Fri, Jul 3, 2009 at 23:54, Hyrum K. Wright<hy...@hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_client/merge.c Fri Jul 3 14:54:42 2009 (r38331)
>...
> @@ -6809,6 +6823,10 @@ record_mergeinfo_for_added_subtrees(svn_
> apr_pool_clear(iterpool);
> SVN_ERR(svn_dirent_get_absolute(&added_abspath, added_path,
> iterpool));
> + SVN_ERR(svn_dirent_get_absolute(&dir_abspath,
> + svn_dirent_dirname(added_path,
> + iterpool),
> + iterpool));
simpler: dir_abspath = svn_dirent_dirname(added_abspath, iterpool);
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2381399
Re: svn commit: r38331 - trunk/subversion/libsvn_client
Posted by "Hyrum K. Wright" <hy...@hyrumwright.org>.
On Aug 7, 2009, at 12:31 PM, Greg Stein wrote:
> On Fri, Jul 3, 2009 at 23:54, Hyrum K. Wright<hy...@hyrumwright.org>
> wrote:
>> ...
>> +++ trunk/subversion/libsvn_client/merge.c Fri Jul 3 14:54:42
>> 2009 (r38331)
>> ...
>> @@ -6809,6 +6823,10 @@ record_mergeinfo_for_added_subtrees(svn_
>> apr_pool_clear(iterpool);
>> SVN_ERR(svn_dirent_get_absolute(&added_abspath, added_path,
>> iterpool));
>> + SVN_ERR(svn_dirent_get_absolute(&dir_abspath,
>> +
>> svn_dirent_dirname(added_path,
>> +
>> iterpool),
>> + iterpool));
>
> simpler: dir_abspath = svn_dirent_dirname(added_abspath, iterpool);
r38624.
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2381426