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

RE: svn commit: r26803 - in trunk/subversion: libsvn_client tests/cmdline

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-10-01 18:00:41 CEST

>> Let me explain what it does here.
>> Your WC target is 'COPY_OF_A/D/G', requested merge range is
>> 22:100 Suppose if you have the following 'children_with_mergeinfo'
>> [
>> {path:'COPY_OF_A/D/G', 'remaining_ranges':'22-26, 28-29,
>> 34-36, 40-100'}, {path:'COPY_OF_A/D/G/pi',
>> 'remaining_ranges':'21-29, 34-36, 40-100'}, ] In first
>> iteration of WHILE loop in discover_and_merge_children we run
>> a merge for 22:26(26 is the nearest end rev).
>>
>> So before doing the merge we need to slice COPY_OF_A/D/G/pi's
>> remaining_ranges to so that it has the following remaining
>> ranges '21-26, 27-29, 34-36, 40-100', so that in the next
>> while loop we can do a merge for '27-whatever-next-rev' on
>> 'COPY_OF_A/D/G/pi'

>What about r27? In your example COPY_OF_A/D/G/pi has these initial
>remaining_ranges:

> '21-29, 34-36, 40-100'

>But per your example slice_remaining_ranges() would convert them into:

> '21-26, 27-29, 34-36, 40-100'

>And r27 wouldn't be merged no?

>Paul

Now I got it, Let me write a test to prove this failure and fix it.

With regards
Kamesh Jayachandran
Received on Mon Oct 1 18:02:47 2007

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