"Campbell, Matthew A" <Matthew.Campbell@Relizon.com> writes:
> 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. :(
When the integrator does the merge, they can set the svn:author
revision property to at least use the original author. They can
either propset by hand, or use svn --username, or whatever works.
(This is a clumsy workaround, I'm aware.)
> 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.
Yup, it's very much related. Solution Not Yet Scheduled, sorry.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 3 00:43:46 2004