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

[merge-tracking] record mergeinfo on wc to wc copy

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-07-28 21:25:56 CEST

Hi,

     As part of the merge-tracking tasks, we need to implement recording of
mergeingo on cp. This is needed because copy in itself is equivalent of
merging 1-REV of the source into the target (where REV is the revision
specified in the cp or the current revision of the wc)

     There are four ways a 'svn cp' can occur:
     - wc to wc
     - wc to repos
     - repos to wc
     - repos to repos

     As a first step, am planning to do the wc to wc part. Am thinking on
the following lines:

    1) Write a new function called append_wc_mergeinfo(target,
new_mergeinfo), to prop_get the existing value of svn:mergeinfo on the
target path, and to append/merge the provided mergeinfo and set the
mergeinfo back into the target's svn:mergeinfo property.

     2) Call append_wc_mergeinfo() in svn_wc_copy2() just before calling
svn_wc_adm_close().

     Suggestions, criticisms welcome.

Regards,
Madan.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 28 20:56:01 2006

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