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

Re: Tree conflict detection in 'svn merge'

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 29 Feb 2008 11:05:52 +0100

On Fri, Feb 29, 2008 at 12:20:47AM +0000, Julian Foad wrote:
> I'm afraid my knowledge of merging is not yet up to the task of analysing this.

Same here.

> I'll see what I can do, but to begin with that mainly means getting help
> from someone who knows about merging.

Indeed, it would be great if someone who was involved in implementing
all the merge-tracking magic could provide some comments.

Maybe we could even leverage merge-tracking meta data a bit during tree
conflict detection? I don't know enough [yet] about how merging works
to make up my mind about this.

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

  • application/pgp-signature attachment: stored
Received on 2008-02-29 11:16:06 CET

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.