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

Re: [PATCH] RFC: #2064, new diff_callbacks API

From: Max Bowsher <maxb_at_ukf.net>
Date: 2004-10-24 23:20:45 CEST

Peter N. Lundblad wrote:
> Hi,
> I'm starting to do something about issue #2064, which is about merge not
> doing keyword expansion/special file handling correctly. This needs an API
> change, which could have some feedback. Attached is a patch to svn_wc.h
> with my proposed changes. Basically it puts file content changes (and
> additions) together with prop changes in the same function call, so that
> all information is available for the merge process. Then, there is the
> usual compability and deprecation stuff.

Whilst this is being considered, we should be aware that there is another
propchange API change required.
Currently propchanges are represented as "Set value to X". We need to change
this to "Change value from A to B" to make merging possible. (Currently
propchange merging is extremely naive - a propchange to an already modified
property always conflicts, even when it should not)


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Oct 24 23:21:13 2004

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.