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

Re: Symmetric merge -- current test failures when enabled

From: Branko ─îibej <brane_at_apache.org>
Date: Wed, 09 May 2012 20:43:49 +0200

On 09.05.2012 18:54, Julian Foad wrote:
> The second group concerns merging changes into a file from its own (past or future) history; this kind of merge isn't a 'sync' so shouldn't be handled by this code path.

We keep coming back to this ... I still don't understand /why/ we would
need more than one merge algorithm, or why the symmetric merge would not
work correctly in this case.

Progress looks great otherwise. :)

-- Brane
Received on 2012-05-09 20:43:58 CEST

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