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

[PATCH] RFC: #2064, new diff_callbacks API

From: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2004-10-24 23:01:19 CEST


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.

I don't do this for directories, which might seem inconsistent. The reason
is that we want to add directories before getting file additions, but the
prop changes are not available until the directory is closed by the delta

Some questions:
* For file_deleted, we provide the deleted content, but not the props.
  They are probably cheap to provide, since the mimetype ought to be
  fetched if available. Should I add them. I see no use for them in my
  planned merge changes.
* I kept the mimetype arguments in file_added and file_changed. Strictly
speaking, they can be derived from the props, which probably are available
and cheap if the mimetypes are. Fetching the mimetypes is not hard, but it
is convenient to just have it available and it keeps away some small code
duplication. I'm not sure if I'd drop the mimetype arguments.
* Currently, changedprops can be null, when there are no prop changes.
Maybe it is better to always pass an array and let ->nelts == 0 mean no


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Sun Oct 24 22:45:42 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.