[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Branko ─îibej <brane_at_apache.org>
Date: Thu, 22 Mar 2012 11:56:29 +0100

On 22.03.2012 09:54, 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?

-- Brane
Received on 2012-03-22 11:56:37 CET

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