[PATCH][merge-tracking]merge-tests 12 Fix.

Hi All,

Find the attached patch and log.

With regards
Kamesh Jayachandran

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

   In case of three way merge handle the fact that a svn_merge_range_t's
    "start" and "end" are inclusive.

* subversion/libsvn_client/diff.c
  (grok_range_info_from_opt_revisions):
   In case of three way merge handle the fact that a svn_merge_range_t's
    "start" and "end" are inclusive.
]]]

Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 21604)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -2162,6 +2162,7 @@
   else
     {
       *merge_type = merge_type_merge;
+ range->start += 1;
     }
 
   return SVN_NO_ERROR;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 22 15:10:34 2006