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

Re: svn commit: r1135176 - /subversion/trunk/subversion/libsvn_client/merge.c

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Mon, 13 Jun 2011 16:48:28 -0400

On 06/13/2011 01:23 PM, Stefan Sperling wrote:
> On Mon, Jun 13, 2011 at 05:01:17PM -0000, cmpilato_at_apache.org wrote:
>> Author: cmpilato
>> Date: Mon Jun 13 17:01:16 2011
>> New Revision: 1135176
>>
>> @@ -10281,6 +10286,15 @@ calculate_left_hand_side(const char **ur
>> _("'%s@%ld' must be ancestrally related to "
>> "'%s@%ld'"), source_url, source_rev,
>> target_url, target_rev);
>> +
>> + /* If the source revision is the same as the youngest common
>> + revision, then there can't possibly be any unmerged revisions
>> + that we need to apply to target. (Since it */
>
> The above comment stops... prematurely.

r1135271. Thanks.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2011-06-13 22:49:01 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.