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

vss->svn migration issue

From: Warren Cooper <warren_cooper_at_yahoo.com>
Date: 2006-12-10 17:42:07 CET

We have a source code for a project in microsoft source safe and would like to migrate to svn. Our problem is that we have inherited several vss projects that really contain different 'branches' of the same source code. The developers currently hand-code changes across all projects rather than using a source control merge facility across branches. So in vss, for example, I have /ProjectA /ProjectB /ProjectC let's say I have the following java file. In reality, these projects are large , but most of the files are unchanged across the projects. /ProjectA/src/Hello.java /ProjectB/src/Hello.java /ProjectC/src/Hello.java In svn, Project A should be imported into a trunk, and 'B' and 'C' are branches of that trunk. Is it possible to do this and still have the merge operations work properly? So far, my attempts result in the diff tool working as expected; I see no difference noted for this file (Hello.java) across the trunk and branches. But if I create a revision in the trunk that contains OTHER modifications (let's say I create a new file called 'Goodbye.java', and then I attempt to merge that revision to the trunk, it detects 'Hello.java' as also needing a change in addition to the Goodybye.java file in the revision I am merging. ( I read the svn doc, and realize the differences between diff and merge. ) I don't see how I can import my vss projects into the svn branches, so the files that really never changed across these projects appear to share an ancestry with the trunk. thanks for your help. I'd really like to migrate to svn, but if I can't merge files across these existing branches, I will not be able to persuade my company to change its ways. ____________________________________________________________________________________ Any questions? Get answers on any topic at www.Answers.yahoo.com. Try it now.
Received on Sun Dec 10 17:43:33 2006

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