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

Re: Migrating CVS sandbox

From: Christopher Ness <chris_at_nesser.org>
Date: 2005-09-28 17:12:12 CEST

On Wed, 2005-09-28 at 10:45 -0400, Michael Caplan wrote:
> Hi,
>
> I'm wondering if anyone has any opinions on how I can best go about
> migrating a cvs sandbox to a svn sandbox without removing the originally
> created cvs sandbox? The issue I have with the cvs sandbox is that
> there are loads of non cvs files found throughout the sandbox that I
> need to maintain. I tried to do a svn checkout on top of the cvs
> sandbox, but svn blocks that. Any suggestions?

Off the top of my head... You have a CVS working copy that you tried to
copy over a SVN working copy. So it sounds like you want to merge them
together.
The order of the merge I'm not sure of, but I am going to assume you
want to put CVS files into a SVN working copy. Make adjustments as
needed.

Import the CVS sandbox, minus the CVS dirs and other accounting
information into a branch directory.

Merge the svn working copy with the newly imported CVS branch.
Fix conflicts and enjoy.

Cheers,
Chris

-- 
http://www.nesser.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 28 17:15:30 2005

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