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

Re: doing Perforce-style "pure" integrations

From: Karl Fogel <kfogel_at_galois.collab.net>
Date: 2000-08-31 16:33:21 CEST

John P Cavanaugh <cavanaug@sr.hp.com> writes:
> You cant automate detection if a merge is truly pure, but you should
> be able to detect when it clearly isnt pure, right?? Is it worth
> having to code to detect false positives??

I think you can't, actually. By allowing users to do the marking, you
allow them to declare *any* merge pure, including one that involved
textual conflict resolution. And this is useful, because they want
those edits to be considered part of the merge, as though their
ancestry is the merge source.
Received on Sat Oct 21 14:36:07 2006

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