Re: CVS - import to 1.1

[David Martin]

"Matthew Persico" <address@hidden> wrote in message
news:address@hidden
> After wiping the egg off my face and doing some furious typing at my own
> desk, the nearest thing I can figure out to explain what happened is that
> the lock was placed on 1.1.1.1 and my commit as the other user was on 1.1
to
> become 1.2. As soon as I had a 1.2 version to work with, all the locking
> worked exactly as expected.
...
> What I'd like to know is this:
>
> Is there a way to cvs import into 1.1, not 1.1.1.1? Without the branch,
the
> first lock and commit attempts will work as advertised.
>
> If I cannot do this, then I have to create an empty project and then write
a
> script that will recurse a tree of code, doing cvs adds as appropriate and
> I'd rather not do that.
>

What I typically do after a cvs import for the purpose of establishing
initial repository content (i.e. it really isn't vendor code) is to
immediately check it out and then force a commit to the trunk.

I believe this would work around the problem you're seeing.

cvs co <module>
cvs commit -f -R -m "Force commit to trunk following import"

The expense of this is that you'll have revisions 1.1, 1.1.1.1, and 1.2,
which isn't all that bad for the convenience of it (compared to writing
a script to recursively add everything).

David