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

Re: svn commit: r34016 - in trunk: . notes/tree-conflicts subversion/include subversion/include/private subversion/libsvn_auth_kwallet subversion/libsvn_client subversion/libsvn_ra subversion/libsvn_ra_local subversion/libsvn_ra_neon subversion/libsvn_ra_serf subversion/libsvn_ra_svn subversion/libsvn_subr subversion/mod_dav_svn subversion/mod_dav_svn/reports subversion/svnserve subversion/tests/cmdline subversion/tests/libsvn_subr tools/buildbot/slaves/win32-xp-VS2005 tools/server-side www

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Mon, 03 Nov 2008 06:16:48 +0100

pburba_at_tigris.org wrote:
> Author: pburba
> Date: Sun Nov 2 19:15:17 2008
> New Revision: 34016
>
> Log:
> Merge the issue-3067-deleted-subtrees branch to trunk.
[...]

[trunk/subversion/libsvn_client/merge.c]
> - if (segment->path
> - && strcmp(segment->path, mergeinfo_path + 1) != 0)
> - push_range(different_name_rangelist,
> - segment->range_start,
> - segment->range_end, TRUE, pool);
> - }
[...]

Looks like you removed the last use of push_range(). Remove push_range()
altogether?

~Neels

Received on 2008-11-03 06:17:13 CET

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