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

Re: [merge-tracking] replicating commits

From: Giovanni Bajo <rasky_at_develer.com>
Date: 2006-07-15 16:41:09 CEST

John Peacock wrote:

>> The problem is that you can't simply exclude the author: you'd want
>> to see the original authors of the merged changes to appear instead.
> You are conflating two different levels of information. At the
> repository level, there is *one* author of the merge (the person
> actually performing the merge). At the merge history level, you want
> to be able to see original authors.
> In essence, the merge history needs to contain enough information to
> retrieve the matching repository history, and nothing more. There is
> no reason to duplicate the information from the repository (which is
> not going anywhere). As long as the merge source (path and revision)
> is available as properties, blame and log can be extended later to
> follow this information backwards past the merge. This is true even
> if the initial pass at merge tracking merely does what SVK already
> does: automate repeated merges without conflict.

Yes, I know the information is available somewhere, but I'm going to stress
the point that it's impossible to properly extract it.

If you do a single merge that spans 20 revisions, there is basically no
level at which Subversion knows which revision each line of change comes
from, especially since the user is free of fixing conflicts (which might
mean renaming couple things, moving things around across files and so on)
before the commit. After the commit happened, a property simply pointing to
the list of revisions from which the merge was done might be enough to
reconstruct information for "svn log", but surely not for "svn blame" and
maybe not even for "svn log -v". Even if you exclude the case of conflicts
manually fixed by the user, only back-guessing (for the purpose of svn
blame) the normal context heuristic done when a patch is applied looks
pretty hard to me.

Unless I'm seriously missing something, which is very well possible since
I'm no SVN guru :)

Giovanni Bajo
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 15 16:41:42 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.