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

new propchange merging algorithm

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-24 22:37:04 CEST

On Jun 24, 2005, at 3:08 PM, sussman@tigris.org wrote:

> Author: sussman
> Date: Fri Jun 24 15:08:31 2005
> New Revision: 15164
>
> Log:
> * notes/propmerging_sanity.txt: new file for issue #2035 discussion.
>
>

Feedback is welcome. This file documents the results of a couple of
discussions that kfogel and I had.

In a nutshell, 'svn merge' is flawed. It's using a diff3 algorithm
to merge file-text, but is blindly applying propdiffs. To solve
issue #2035, I'm going to teach libsvn_wc to use a diff3 algorithm
when merging propchanges as well.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 24 22:37:47 2005

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