[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: John Peacock <jpeacock_at_rowman.com>
Date: 2006-07-15 16:18:46 CEST

Giovanni Bajo 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.

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Blvd
Suite H
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5747
---------------------------------------------------------------------
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:18:57 2006

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