[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]data confusion(corruption?) when the source of merge has the merges from multiple other sources

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-11-02 07:22:59 CET

>> - apr_hash_set(*result, mergedfrom, APR_HASH_KEY_STRING,
>> + apr_hash_set(*result, lastmergedfrom,
>> APR_HASH_KEY_STRING,
>
> Really? I think *this* change would cause wrong paths mapped to wrong
> rev-ranges. Do you have any tests to prove the need for this change?
I don't have a python testsuite to prove.
But you can use the small dump at
http://puggy.symonds.net/~kameshj/my_test_area_multi_merge.dmp
(mergetracking svn) cp url/to/trunk url/to/branches/somethingelse -m
'blah blah'
Observe the property of 'svn:mergeinfo' on /trunk and
/branches/somethingelse to see the defect.
Apply the patch and observe the same you will get what I mean.
>
> Apart from that, I do really see a problem where the first merged from
> path will never get set into the *result hash. To counter this, we
> should have the if condition as below:
>
>> if (lastmergedfrom == NULL || strcmp(mergedfrom,
>> lastmergedfrom) != 0)
           if (lastmergedfrom && strcmp(mergedfrom, lastmergedfrom) !=
0) (I terribly fail to see the difference!).

Observe the code carefully you will see nothing is lost!.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 2 07:23:35 2006

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