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 message: [ Message body ]
Next message: Greg Stein: "Re: svn commit: r1336442 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/copy.c libsvn_wc/adm_files.c"
Previous message: Julian Foad: "Symmetric merge -- current test failures when enabled"
In reply to: Julian Foad: "Symmetric merge -- current test failures when enabled"
Next in thread: Julian Foad: "Re: Symmetric merge -- current test failures when enabled"
Reply: Julian Foad: "Re: Symmetric merge -- current test failures when enabled"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]