Re: Tree conflict detection in 'svn merge'
From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 21 Mar 2008 16:20:09 +0100
On Wed, Mar 19, 2008 at 11:11:59PM +0000, Julian Foad wrote:
I can't recall this discussion properly, I'm afraid.
What do you mean by "the target isn't similar to the merge-left source"?
Is the decrease in complexity you mention already covered in detection.txt,
I approve your version of the patch to detection.txt, by the way,
You must mean a different use case, because you talked about UC5
-- Stefan Sperling <stsp_at_elego.de> Software Developer elego Software Solutions GmbH HRB 77719 Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96 13355 Berlin Fax: +49 30 23 45 86 95 http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.