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

RE: CVS and Subversion sharing source code

From: L. Wayne Johnson <wayne_at_zk.com>
Date: 2006-07-13 02:16:15 CEST


>> -----Original Message-----
>> From: Scott Johnson [mailto:sjohnson@keypress.com]
>> Sent: Wednesday, July 12, 2006 4:17 PM
>> To: users@subversion.tigris.org
>> Subject: CVS and Subversion sharing source code
>> Hi all--
>> I work with a development team that is attempting to
>> coordinate software development with another team of
>> developers at another company. The other developers have a
>> CVS repository set up and we would like to take their code,
>> put it in our own Subversion repository so we can track and
>> maintain our changes, and then commit it back to the main
>> CVS repository at various intervals.
>> Does anybody have any particular advice about how to carry
>> this out, or advice AGAINST doing this, or any particular
>> knowledge about whether this is possible? It is not clear to
>> us what sort of gotchas we are going to run into, but we are
>> hoping that if we take the code checked out of CVS, and use
>> it to create a Subversion repository WITHOUT the CVS folders
>> (advice on a painless way to do this would be helpful!),
>> then we can proceed and both CVS and Subversion will see any
>> changes as being no different from any users changes. We
>> just have to be careful never to add the CVS folders to the
>> Subversion repository, and vice-versa. Right?
>> Thanks for any help you can provide.

I do something similar to this. Our company uses an old version of Source
Integrity. Because of our current policies it can be months between
check-ins (don't even ask!) I run a local SVN server to tack my work and
later check stuff into our official source code control. I am on the only
one using the repository so quite a few scenarios never come up.

Currently I have a working copy that is dual source code controled called
xxxx_base. I use this working copy to move stuff between the 2. I never do
any work in the working copy.

I create another working copy when I do any work. Whether I create the wc
based on the trunk or a branch is related to the how soon I think I can
check in the code. When I am ready to check the code in to our official
source code control I move the changes into the xxxx_base working copy and
check it in from there. At strategic (?) points I update the xxxx_base from
our official source code control and check it back into SVN.

There may be a better way to do this. Even though I am the only user it can
get messy really quick if I am not careful. The biggets pain is that we use
both $Header$ and $Log$ expansion on so as soon as I move stuff from SVN
into Source Integrity I have to make sure to check the expansion changes
back into svn.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 13 02:17:36 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.