Rename and ancestry (help,pleeze!)

[Geoffrey Emmans <em...@qbf.de>]

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,

Geoffrey


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Rename and ancestry (help,pleeze!)

[Ryan Schmidt <su...@ryandesign.com>]

On May 22, 2006, at 12:57, Geoffrey Emmans wrote:

> 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.

svn move does NOT destroy ancestry. The history is still there. It's  
a delete and then an add WITH HISTORY. You can still see the history  
of all edits under the file's previous name and/or location.

> 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).

The merge would not be successful, I think, because Subversion is not  
yet tracking renames as well as it could. It is an open feature  
request and it is complex to figure out how to implement it correctly  
in the general case, so it is still being discussed. Please do not  
say that Subversion will destroy changes, because it is a design  
philosophy of Subversion not to do so. If you ever find Subversion is  
destroying changes, then please provide the reproduction recipe so  
that the behavior can be corrected.


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



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org