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

Re: Merge & blame

From: Max Bowsher <maxb_at_ukf.net>
Date: 2004-07-03 12:00:13 CEST

Campbell, Matthew A wrote:
> In our repository, there are two access groups; admins and developers.
> Production code (/trunk) is readable to all, but only writable to admins.
> Most (if not all) development changes are actually executed in /branches by
> people in the developers group.
>
> Using svn merge to integrate changes into the trunk is the obvious method,
> however:
> 1) All incremental commits to the branch are lost
> 2) "blame" ownership gets changed to the person doing the merge - the admin
> user
>
> Is there any way around this? "switch" looked promising, until I watched it
> delete some newly-created files. :(

Some scripting might provide a way around this.

For each individual revision to be merged:
Merge to trunk (probably with modified log message, giving info on the merge)
Reset the svn:author property to the author of the original commit.

> Is this related to the lack of "merge tracking" I'm reading about in other
> threads? If so, then I'm encouraged by the fact that it's on the to-do
> list, and am curious as to which version of SVN for which this is likely to
> be implemented.

It's not been scheduled. Lots of people agree its important, but the current major feature on the drawing board is locking. Locking
will probably end up in 1.2, and its likely that serious thoughts about merge tracking will then happen. However, until the design
is mostly done, its impossible to give a reasonable estimate of how long the coding will take.

Max.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 3 12:04:55 2004

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