[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: Daniel Rall <dlr_at_collab.net>
Date: 2006-08-02 18:43:19 CEST

On Wed, 02 Aug 2006, Madan S. wrote:

> On Sat, 29 Jul 2006 03:12:49 +0530, Daniel Rall <dlr@collab.net> wrote:
> >On Sat, 29 Jul 2006, Madan S. wrote:
> >...
> >> As part of the merge-tracking tasks, we need to implement recording
> >>of
> >>mergeingo on cp.
> >
> >Rather, we need to include "copyfrom" history when getting the merge
> >info for a path.
> >
> >>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)
> >
> >The easiest way to implement this happens to be adding the merge
> >history and "revisions in existence" of a copy's source and setting
> >that as the "svn:mergeinfo" for its destination path.
> >
> >I think 1-REV might not be correct, since very early revs might
> >represent an entirely different object which was moved to a subsequent
> >path in a later revision. Do we actually need to do some history
> >tracing here to find the oldest rev for our copy source?
> To do the above, shouldn't we have to go to the repos to obtain the
> history information pertaining to the source?

Yes, at some point.

If we did this at 'commit'-time instead, the merge info for the
destination of the 'copy'/'move' would not be correct. Any merges
would then need to do that same history tracing as part of the
'merge', smearing the implementation details across commands....ugh.

> Would it be acceptable in a wc to wc copy?

Good question. This is probably a (rather significant) change in
behavior for what I assume was previously a disconnected operation.

Anyone else have thoughts on this?

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 2 18:45:02 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.