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

Merge & blame

From: Campbell, Matthew A <Matthew.Campbell_at_Relizon.com>
Date: 2004-07-02 21:45:55 CEST

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,
1) All incremental commits to the branch are lost
2) "blame" ownership gets changed to the person doing the merge - the admin

Is there any way around this? "switch" looked promising, until I watched it
delete some newly-created files. :(

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.


Matt Campbell, Programmer Analyst
The Relizon Company (Timonium, MD)
Tel: 410-308-7059 Fax: 410-561-8237

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 2 21:55:23 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.