Re: Tree conflict detection in 'svn merge'

On Wed, Mar 19, 2008 at 02:26:49AM +0000, Julian Foad wrote:
> --- Stefan Sperling <stsp_at_elego.de> wrote:
> > Have you found someone informed about the details of merging
> > who is willing to help us analyze the issue yet?
> > Would anyone on the list reading this volunteer to do so?
>
> I've just spent a couple of days with Paul and Mike and although we weren't
> specifically discussing tree conflicts I've gained a much better general
> understanding of how merging works in Subversion. I think I can now see how
> far we have to take this conflict detection, and it's not too far.

OK. I am eagerly waiting for details :)

> > It seems that part of Stephen Butler's rather elaborate plan about
> > use cases 4 and 5 in notes/tree-conflicts/detection.txt has been
> > made obsolete by comments made by Nico, stating that at least use
> > case 4 could be detected in much a simpler way. Can you confirm this?
>
> Just a brief note on the rest of your questions: I'm not right back into this
> in detail, but yes I think Nico was right on simplifying that case.

Good, I will try to update detection.txt accordingly.

> On the subject of renames, yes I think we can and should proceed with detecting
> conflicts to the same degree (or lack) of sophistication that "svn merge"
> already does (or doesn't) cope. I think this is feasible and useful.

Great.

-- 
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