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

svn merge and renames?

From: Eli Barzilay <eli_at_barzilay.org>
Date: 2005-05-29 07:46:58 CEST

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

          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
                  http://www.barzilay.org/                 Maze is Life!
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 29 07:48:53 2005

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.