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

Re: diff3 merging behaviors (was Re: svn commit: r15164 - trunk/notes)

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-27 23:46:47 CEST

On Jun 27, 2005, at 3:20 PM, Greg Hudson wrote:
>
> I guess the potentially disturbing thing here is that the local mods
> have not necessarily been recorded yet, and can be lost as a result of
> the merge operation. But why would I be doing a merge on top of local
> mods in the first place? Generally, I'd only do that if I were
> doing a
> sequence of merge commands, such as if I were creating a 1.2 backport
> branch. In that case, I would be pretty frustrated if the text
> base got
> in the way of performing a clean merge.
>

OK, I think I can sleep soundly, our current diff3 algorithm is fine.

If you look at the property-merging file in notes/, I've rewritten
the pseudocode algorithm to completely ignore the text-base-props.
I'd be happy if you folks would give it a quick sanity check.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 27 23:49:08 2005

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