Mark Phippard wrote:
> On Dec 19, 2007 11:24 AM, Kamesh Jayachandran <kamesh@collab.net> wrote:
>
>
>> Merge non-reflective changes from a reflective revision is complete.
>>
>> * Need to address couple of items mentioned by David Glasser on
>> 'get_commit_revs' API.
>> * Have to write one testcase for the following scenario,
>> - reflective revision having multiple reflected range lists (of size
>> 5 or above)
>> and one(from the middle of this rangelist) of them gave a conflict
>> on feature branch and resolved there.
>> When we merge this back to trunk we should take the maximum possible
>> change from reflected_ranges.
>>
>> Once these are done, We can merge this branch to trunk. I hope to
>> complete this by Tomorrow(20-Dec).
>>
>
> We should try to get some review from at least David Glasser, if not
> also Mike P, Dan and/or Karl before merging to trunk. I know they
> have had comments on the SQLite usage. I suspect it would be easier
> to merge your branch to trunk and then have them modify the SQLite the
> way they wanted to. I think that is up to them though.
>
> I believe there was also some concern as to whether this code was
> repeating some of the earlier merge tracking problems that Mike Pilato
> fixed where the code was relying heavily on repository paths as
> strings as opposed to following the actual ancestry. I could be wrong
> about that though, there has been so much different discussion around
> these areas it is hard to keep track of it all.
>
> Anyway, by all means finish up the branch but you should seek out some
> coordination and approval with the others before merging it back to
> trunk.
>
>
Sure.
Thanks,
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 Wed Dec 19 17:31:46 2007