Wouldn't a less kludgy fix be to just unset RCSINIT at the top of the
script? Are there any settings that the user would forseeably want to
override for this usage(reading from a CVS repository during an import to
Subversion)? If the issue really is "people using RCS directly will get
behavior based on their settings rather than based on what CVS would
probably have done" then that seems like the best bet to me...
Jay Freeman (saurik)
----- Original Message -----
From: "Marc Singer" <firstname.lastname@example.org>
To: "Jack Repenning" <email@example.com>
Sent: Friday, August 29, 2003 8:30 PM
Subject: Re: Does cvs2svn work in the absence of branches or tags?
> On Fri, Aug 29, 2003 at 04:33:23PM -0700, Jack Repenning wrote:
> > At 2:49 PM -0700 8/29/03, Marc Singer wrote:
> > >In looking at the output, I think I see the problem. I hadn't paid
> > >attention the first time.
> > >
> > >co: /repository/coastal/ssem/RCS/commands.f,v: No such file or
> > > adding or changing 1.95 : trunk/ssem/command_functions.cc
> > >
> > >It looks like the co command is looking for RCS subdirectories. I
> > >that a long time ago, I set RCSINIT to '-x'. It may behoove the script
> > >to check for the RCSINIT environment variable.
> > I don't know what RCSINIT is, but this step is being done by the
> > actual RCS co; shouldn't it be obeying RCSINIT (whatever it is)?
> According to the man page for RCS, RCSINIT sets options for the RCS
> commands. Because you are using RCS instead of CVS to handle the RCS
> files, you are subject to the user's environmental variations for
> executing the command. It may be desirable to set the -x switch for
> co to explicitly reference the ,v files since that is the only way
> that CVS works. RCS has the option of using RCS/ directories to store
> log files instead of renaming source file with a ,v suffix.
> I'm not--yet!--subversion savvy. But, here's a patch to override the
> environmental -x switch, if there is one. What it means is that co
> will look first for FILENAME,v and then for RCS/FILENAME. As far as I
> know, CVS will only use the ,v format. Setting -x to ,v/ is changing
> it to the default on most platforms.
> Index: tools/cvs2svn/cvs2svn.py
> --- tools/cvs2svn/cvs2svn.py (revision 6924)
> +++ tools/cvs2svn/cvs2svn.py (working copy)
> @@ -1028,7 +1028,7 @@
> ### use it to set svn:mime-type.
> basename = os.path.basename(rcs_file[:-2])
> - pipe = os.popen('co -q -p%s \'%s\''
> + pipe = os.popen('co -x,v/ -q -p%s \'%s\''
> % (cvs_rev, rcs_file.replace("'", "'\\''")), 'r')
> # You might think we could just test
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Sat Aug 30 06:48:38 2003