[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: Bob Proulx <bob_at_proulx.com>
Date: 2005-05-30 16:47:45 CEST

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

Exactly what command did you use to merge? There are different forms
available and I believe will give different results in this case. At
the moment subversion does not have very powerful merge capability and
renames are especially troublesome. This capability is planned
development for the future.

> 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"??

You are seeing one of the many complexities that make merging very
difficult. This is one of those often discussed problems. I was just
looking over a discussion very similar to your problem on the monotone
list. You may find it interesting reading.

  http://article.gmane.org/gmane.comp.version-control.monotone.devel/3264

That thread starts here:

  http://thread.gmane.org/gmane.comp.version-control.monotone.devel/3240

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 30 16:49:34 2005

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