RE: Repository as Branch

Hi Micheal,

Thanks for your quick reply.

When we created the customer's CVS repositories, we just took a copy of
the working copy from the core repository and checked it into a new
repository, rather than copying the repository itself. It sounds like
this wouldn't provide enough information to link the history together;
there would just be the date the customer file was checked in, which
might not be the date it was branched. 

Setting up the fake branches sounds like the most straightforward
solution. Would this give a problem merging the branch changes back into
the core later on? 
 
Thanks,
Vicky.

-----Original Message-----
From: Michael Haggerty [mailto:[email protected]] 
Sent: 22 April 2010 05:34
To: Vicky Chester
Cc: [email protected]
Subject: Re: Repository as Branch

Vicky Chester wrote:
> I'm converting our company's source from CVS to SVN and have a weird 
> situation with branches.
> We have a core line of development which is checked into a core CVS 
> repository. Different customers then require changes to the core but 
> instead of putting these changes in branches in CVS, the project gets 
> copied, modified and checked into a new customer-specific CVS 
> repository.

In these situations, did you copy the whole CVS repository (i.e., with
history) or did you just copy a snapshot of the working copy?

> We're now moving our CVS repositories over to SVN and want to put the 
> customer-specific and the core code in a single repository. Is there 
> any way as part of the cvs2svn conversion to get both the core and 
> customer-specific repositories into the new SVN repository and have 
> the customer-specific repository changes as branches?

There is no easy way to do this.

You could do a multiproject conversion [1], causing all of the
repositories to be converted into different paths within a single
Subversion repository.  You could even cause the customer CVS
repositories to be recorded in paths in the Subversion repository that
make them look like branches.  But there is no easy way to "connect" the
histories of the customer CVS repositories to the history of the core
project, so Subversion wouldn't know that they branched from it.

If (see question above) you copied the whole CVS repository to the
customer repositories, then such a conversion would have the additional
disadvantage that the overlapping part of the history would be stored in
Subversion multiple times.

Depending on the details of how you did this and whether you have any
extra data telling when the customer repositories were created, it might
be possible to write custom code to produce a properly branched
Subversion repository representing the true history of the multiple CVS
projects.  If you need help with this you might consider getting paid
assistance with your conversion [2].

Michael

[1] http://cvs2svn.tigris.org/faq.html#onetoone
[2] http://cvs2svn.tigris.org/faq.html#commercialsupport

________________________________________________________________________
This e-mail from Ultra Electronics Holdings plc and any attachments to it are confidential to the intended recipient and may also be privileged. If you have received it in error please notify the sender and delete it from your system. If you are not the intended recipient you must not copy it or use it for any purpose nor disclose or distribute its contents to any other person. All communications may be subject to interception or monitoring for operational and/or security purposes. Please rely on your own virus checking as the sender cannot accept any liability for any damage arising from any bug or virus infection. Ultra Electronics Holdings plc is a company registered in England and Wales, registration number 2830397. The address of its registered office is 417 Bridport Road, Greenford, Middlesex, UB6 8UA.

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2592305

To unsubscribe from this discussion, e-mail: [[email protected]].