[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: help, doing a CVS import messed up my working dir!?!?!

From: Dave Korn
Subject: RE: help, doing a CVS import messed up my working dir!?!?!
Date: Mon, 22 Aug 2005 19:22:48 +0100

----Original Message----
> From: Mark D. Baushke
> Sent: 22 August 2005 19:06

> Dave Korn writes:
>>   <sound of pennies dropping, lightbulbs pinging, dawn breaking, one
>> hand clapping etc.> 
>>   So I guess what I really want (in order to make the whole procedure
>> work the way I was previously expecting it to) is to use "cvs ci -f"
>> after my very first import; that way, all the files will have the
>> "branch" tag
> s/"branch" tag/RCS default branch/

  Actually, s/tag/directive/ is what I originally intended to say; it
ends up meaning the same in any case since the branch directive is what
specifies the default branch....  

> Well, any new file that is added via 'cvs import' will have the same
> problem as you move forward.

  Ah.  Didn't work that out, and don't particularly want to have to
manually move all new files across.... 

> The script Chris provided in the URL I gave you avoids this by making
> version 1.2 always dead. This means you will explicitly need to move
> what you want from the VENDOR branch into the main trunk rather than
> implicitly (and is also what the 'cvs import -X' does).

> If you are going to add a patch, pick up the -X feature to cvs import
> that is in the thread I gave previously. It is an easier to audit
> reality and allows for someone who comes after you to be able to do the
> right thing.

  I'm not sure; isn't what I want for my purposes just a quick hack to the
server so that the "branch 1.1.1" directive is just never ever added to the
RCS file by an import (subject to a commandline option being specified)?
Couldn't I just let the r1.1 that you mentioned that was a copy of r1.1.1.1
be the base of the main trunk?

Can't think of a witty .sigline today....

reply via email to

[Prev in Thread] Current Thread [Next in Thread]