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

Re: svn merge and renames?

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-05-30 15:16:28 CEST

On 29.05.2005, at 07:46, Eli Barzilay wrote:

> I was trying out "svn merge" to see how it deals with renames. I did
> something like this:
>
> copy the trunk to a branch
> edit a file <f1> on the trunk
> rename <f1> to <f2> on the branch
> used svn merge on the trunk
>
> svn merge does show something like
>
> D <f1>
> A <f2>
>
> but the contents of <f2> does not have any of the changes to <f1>. Is
> this the way things are supposed to work? Is there any way to avoid
> such mistakes besides telling people to "be careful when renaming"??

What I've gathered from previous discussions on this list is that
unfortunately yes, this is the way it is right now, and that "true
renames", which are planned for Subversion 1-point-something (1.4 or
1.5 maybe) should fix this situation, or at least make it better.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 30 15:18:12 2005

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