RE: problem with "co -d xx -n" : bug or feature?

[Chris Cameron]

If anyone is still interested, I located the information in our CVS source. 
 This diff is against 1.10, but it is only a couple of lines to change.  It 
is a patch to allow & and -d to be used in one line in the modules file 
(like Cederqvist says you can!).  We downloaded the original patch from the 
CVS web page

address@hidden:/home/users/ccameron/CVS_src/src] cvs diff -r1.2 -r1.1 
modules.c
Index: modules.c
===================================================================
RCS file: /CVS/CVS_src/src/modules.c,v
retrieving revision 1.2
retrieving revision 1.1
diff -u -r1.2 -r1.1
--- modules.c   1999/03/26 05:14:21     1.2
+++ modules.c   1999/03/26 04:58:29     1.1
@@ -376,14 +376,12 @@
             */
            char *dir;

-           /*fix for combining & with cvs -d options*/
-           do_special_only:
            /* XXX - XXX - MAJOR HACK - DO NOT SHIP - this needs to
               be !pipeout, but we don't know that here yet */
            if (!run_module_prog)
                goto out;

-           dir = where ? where : (mwhere ? mwhere : mname);
+           dir = where ? where : mname;
            /* XXX - think about making null repositories at each dir here
                     instead of just at the bottom */
            make_directories (dir);
@@ -505,11 +503,6 @@
     modargv += optind;
     if (modargc == 0)
     {
-    /* NHR if there are special options, then handle them
-       with the code that handles the case when there are nothing
-         but special options */
-        if (spec_opt !=3D NULL) goto do_special_only;
-
        error (0, 0, "modules file missing directory for module %s", 
mname);
        ++err;
        goto do_module_return;
address@hidden:/home/users/ccameron/CVS_src/src]

On Saturday, February 03, 2001 12:39 AM, Chris Cameron 
[SMTP:address@hidden wrote:
> There used to be a patch available at cvshome to fix a similar problem in
> the modules file.  I cannot remember the exact details, but we installed 
the
> patch.  AFAIK it has not been incorporated into the main CVS tree.  Sorry 
I
> can't give you any more details, but I'm out of the office, visiting 
sales
> offices in the Americas, so can't get at our CVS repository to give you 
more
> details.
>
> > -----Original Message-----
> > From: address@hidden
> > [mailto:address@hidden Behalf Of
> > Haefelinger, Wolfgang
> > Sent: Friday, 2 February 2001 7:53 a.m.
> > To: 'address@hidden'
> > Subject: problem with "co -d xx -n" : bug or feature?
> >
> >
> > Hello there,
> > here's  my  problem:  defined an "ampersand module"
> > in  $CVSROOT/CVSROOT/modules and got a problem when
> > checking out the module using checkout options "-d"
> > and "-d" and want to know whether this is a (known)
> > bug or a feature. That's what I have and what I did
> > on
> >  $uname -a
> >  SunOS intra-dev 5.6 Generic_105181-05 sun4u sparc SUNW,Ultra-2
> >
> >  $cvs --v
> >  Concurrent Versions System (CVS) 1.10.7 (client/server)
> >
> > My repository contains the directories "mod1" and "mod2".
> > Want to checkout them both with a symbolic name. There-
> > fore I added the line "am &mod1 mod2" to the modules
> > file:
> >
> >  $ cat $CVSROOT/CVSROOT/modules
> >  am &mod1 &mod2
> >
> > That's pretty fine since
> >  $ rm -rf am
> >  $ cvs co am
> >  $ ls am
> >  mod1 mod2
> >
> > does exactly what I want. Even better,
> >
> >  $ rm -rf xx
> >  $ cvs co -d xx am
> >  $ ls xx
> >  mod1 mod2
> >
> > let's me checkout the modules in another directory. That's
> > wonderful, wow!
> >
> > BUT, trying also option -n to prevent any additional checkout
> > script from beeing triggered behaves unexpected:
> >
> >  $ rm -rf *
> >  $ cvs co -n -d xx am
> >  $ ls
> >  mod1 mod2
> >
> > The modules are checked out in the working directory and not
> > as beeing told in the subdirectory "xx".
> >
> > BUT-BUT, on the other side,
> >
> >  $ rm -rf *
> >  $ cvs co -n -d xx mod1 mod2
> >  $ ls
> >  xx
> >
> > does the right thing.
> >
> > Ok, I'm much too stupid to understand why 'cvs' behave in
> > this way, therefore  I  ask you, what's going on here. If
> > this is a bug, I'm willing to fix it.
> >
> > Thanks,
> > Wolfi.
> >
> >  _Wolfgang Haefelinger________________________
> >  voice: 069-263-16582
> >  email: address@hidden
> >
> > _______________________________________________
> > Info-cvs mailing list
> > address@hidden
> > http://mail.gnu.org/mailman/listinfo/info-cvs
> >
>
>
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs


***************************************************************
Chris Cameron                    Open Telecommunications NZ Ltd
Product Manager                           IN Product Management
address@hidden                           P.O.Box 10-388
      +64 4 495 8403 (DDI)                          The Terrace
fax:  +64 4 495 8419                                 Wellington
cell: +64 21 650 680                                New Zealand
Life, don't talk to me about life ....(Marvin - HHGTTG)