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

Rename and ancestry (help,pleeze!)

From: Geoffrey Emmans <emmans_at_qbf.de>
Date: 2006-05-22 12:57:50 CEST

Hi !

I've got a question concerning move/rename and merge (which is sensitive
to ancestry, I presume).
We have two projects with similar files, but for one reason or another
some files got renamed in the newer project. Now we're moving to
Subversion and I'm planning the initial imports.
How can I copy the older project to a new repos-directory, rename the
files and still conserve ancestry?
The problem is: if I do a svn move, the older file will be deleted and
added again with the new name, destroying ancestry. If we then want to
apply a bugfix in this renamed file from the older project to the newer
one via merge, what will happen? I guess the file will be deleted and
added again, destroying any changes in the new project. We could use the
--ignore-ancestry option, but we would have to remember all the renamed
files and treat them differently (which is pretty ugly if we have
bugfix-commits with several files).

Any ideas? Any helpful insights? Any ingenious tools or new features in
Subversion 1.3.X ?!

Thanx loads,


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 23 16:16:29 2006

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.