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

Re: [PATCH] [merge-tracking] Code clarity fix

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-09-02 09:59:30 CEST

Daniel Rall wrote:
> On Thu, 31 Aug 2006, Kamesh Jayachandran wrote:
>
>
> In this case, I find the structure copy style very slightly more
> comprehensible.
>
>
>
>> Anyways..........
>> What is our stance on 'revert range' combining.
>>
>
> IIRC, we don't support it, which explains the (undefined) behavior you
> describe below.
>
>
Attached log/patch achieves the same.

With regards
Kamesh Jayachandran

[[[
Patch by: Kamesh Jayachandran <kamesh@collab.net>

Combining the revert ranges is undefined.

* subversion/libsvn_subr/mergeinfo.c
  (combine_ranges):
   Combining the revert ranges is undefined.
]]]

Index: subversion/libsvn_subr/mergeinfo.c
===================================================================
--- subversion/libsvn_subr/mergeinfo.c (revision 21340)
+++ subversion/libsvn_subr/mergeinfo.c (working copy)
@@ -73,20 +73,6 @@
       (*output)->end = MAX(in1->end, in2->end);
       return TRUE;
     }
- else if (in1->start >= in2->start
- && in1->end <= in2->end)
- {
- (*output)->start = in2->start;
- (*output)->end = in2->end;
- return TRUE;
- }
- else if (in2->start >= in1->start
- && in2->end <= in1->end)
- {
- (*output)->start = in1->start;
- (*output)->end = in1->end;
- return TRUE;
- }
 
   return FALSE;
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 2 09:59:57 2006

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