Re: svn commit: r1303016 - in /subversion/trunk/subversion: include/private/svn_client_private.h libsvn_client/merge.c svn/cl.h svn/main.c svn/merge-cmd.c

Branko Čibej wrote:

> Julian Foad wrote:
>> Yes, that's true for a criss-cross.  However, it's not a problem
>> for normal cases; criss-cross is a rare case.  As I wrote in the
>> criss-cross merge section of
>> <http://wiki.apache.org/subversion/SymmetricMerge>, in that case we
>> probably should consider the relative ages of A1, B1, A3, B3, and A2,
>> but I haven't yet thought about what's the best way to compare them.
>
> Isn't the age inversely proportional to the revision number?

Inversely linear with the revision number, maybe.  But that's not the point.

There are five variables and we need one answer.

function which_of_the_two_bases_to_use(A1, B1, A3, B3, A2) => boolean

- Julian
Received on 2012-03-22 12:11:24 CET