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

RE: Repeated merge strategies

From: Bill Tutt <rassilon_at_lyra.org>
Date: 2002-12-22 08:29:33 CET

> From: Bill Tutt [mailto:rassilon@lyra.org]
> I think there's still a question in my mind if semi-automated
> AS driven merges are worth doing. They seem fraught with
> silent conflict potential. Esp. given the fact that we don't
> version sub-file chunks of text specific to a programming
> language. (i.e. something like Stellation or Intentional
> Programming where the versioned unit is smaller than one
> file)

When I say silent conflict potential I refer to scenarios such as this
comment from the design doc

@c Heh, what about this:
@c B:3 adds line 3, with the text "foo".
@c B:5 deletes line 3.
@c B:7 adds line 3, with the text "foo".
@c B:9 deletes line 3.
@c The user first merges B:5 and B:9 into A. If A had that line, it
@c goes away now, nothing more.
@c Next, user merges B:3 and B:7 into A. The second merge must
@c conflict.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 22 08:30:16 2002

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