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

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

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-08-01 08:36:16 CEST

On Mon, 31 Jul 2006 23:22:51 +0530, Daniel Rall <dlr@collab.net> wrote:

> On Sat, 29 Jul 2006, Madan S. wrote:
>> On Sat, 29 Jul 2006 03:12:49 +0530, Daniel Rall <dlr@collab.net> wrote:


> The "copyfrom" history is every revision where the merge source
> existed at the path it's pegged at for the 'copy' operation.

I see... my understanding was wrong. Thank you for correcting.


> It would matter to the current merge tracking implementation (which
> assumes that "svn:mergeinfo" is accurate and follows it blindly),
> since some other object may've existed at the copy source's path in
> earlier revisions.

yup, yup. Good point.


>> yeah, and I think we can use the existing update_wc_merge_info()
>> function.
>> (Which brings me to another point in a tangential direction - can we
>> abstract the parse_merge_info() call into update_wc_merge_info()?
>> Currently we call parse_merge_info() before calling
>> update_wc_merge_info().)
> The call, yes. The routine, no (since we call it elsewhere).
> It's already like this in my WC as I've been working on the
> notification handling code (for skips, etc.). I'll factor some of
> that out and make an incremental commit today.

Do you mean 'parse_merge_info() must be called inside
update_wc_merge_info()' - yes
'we can use update_wc_merge_info() for copy operations' - no



> IIUC, making a WC routine "loggy" consists of writing a set of
> commands for an operation into a file (in XML, I believe), then
> executing the commands in sequence after they've all been written to
> the file.

ah, yes. Karl explained this logging to me once. Will find out more about

So, we need to do logging for all wc operations? I dont remember seeing
logging for the svn:mergeinfo property manipulations?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 1 08:06:32 2006

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.