Hi All,
Find the attached patch.
With regards
Kamesh Jayachandran
[[[
Patch by: Kamesh Jayachandran <kamesh@collab.net>
Code clarity fix.
* subversion/libsvn_subr/mergeinfo.c
(combine_ranges):
copying in1->start and in1->end to other structure expliciltly is
equivalent
to copying in1 itself. Similarly for in2.
]]]
Index: subversion/libsvn_subr/mergeinfo.c
===================================================================
--- subversion/libsvn_subr/mergeinfo.c (revision 21302)
+++ subversion/libsvn_subr/mergeinfo.c (working copy)
@@ -76,15 +76,13 @@
else if (in1->start >= in2->start
&& in1->end <= in2->end)
{
- (*output)->start = in2->start;
- (*output)->end = in2->end;
+ *(*output) = *in2;
return TRUE;
}
else if (in2->start >= in1->start
&& in2->end <= in1->end)
{
- (*output)->start = in1->start;
- (*output)->end = in1->end;
+ *(*output) = *in1;
return TRUE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 30 12:12:52 2006