Re: how issue-2897 branch solves reflective merges?

Hi Folker,

>>
>> >It is possible. By doing suitable patch arithmetics.
>> >(For example by the algorithm which I posted some time ago.)
>>
>> >But of course, this does not mean that it must be supported
>> >in the next subversion release.
>>
>> Can you post a link to your algorithm?
>
> http://svn.haxx.se/dev/archive-2007-12/0137.shtml
> See also
> http://svn.haxx.se/dev/archive-2007-12/0139.shtml
> http://svn.haxx.se/dev/archive-2007-12/0185.shtml
>
> Cheers,
> Folker
>

I will think through it carefully and figure out how best to merge
conflict resolutions from /feature_branch to /trunk.

Thanks for the links.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-14 16:06:30 CET