Re: Merging two directory structures

[Yves Martin]

On Tue, 2007-11-06 at 16:02 +0100, Frans Englich wrote:

> I looked into cvs import, but it's rather dangerous tool since it modifies 
> the 
> repository directly and this is not trivial. And I neither want to deal with 
> vendor branches and what not, I just want to add files & directories to the 
> repository.
> Tricky problem! Any ideas for how to approach this?

I think cvs import is the best option, using a specific vendor branch.
You should consider each new directory structure as a third-party
release.
When importing a structure on the vendor branch, your current head is
not changed before you apply a merge on a working copy and then commit.
So the recursive addition in the repository is solved and you have
control on what your head becomes after the merge.

You should read the following part of the reference manual:
http://ximbiot.com/cvs/manual/cvs-1.11.22/cvs_13.html#SEC103

It considers that the vendor branch is used at the first import, which
creates the structure. 

I have no idea if it possible to do a first "vendor" import on an
existing structure in the repository and what happens then. You should
test it.

-- 
Yves Martin