[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: Daniel Berlin <dberlin_at_dberlin.org>
Date: 2006-07-16 03:58:46 CEST

Giovanni Bajo wrote:
> 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

It knows it came from those 20 revisions, and can just walk through them
to see which it appeared in.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jul 16 04:00:12 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.