Date: Tue, 4 Jun 2002 18:22:15 -0400 From: "Dan Langille" <dan@langille.org> To: John Polstra <jdp@polstra.com> Cc: hackers@freebsd.org Subject: Re: cvsup doesn't get me what I want Message-ID: <20020604222322.E371E3F3A@bast.unixathome.org> In-Reply-To: <200206041537.g54Fb9V47525@vashon.polstra.com> References: <20020604012638.7CCF63F3A@bast.unixathome.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 4 Jun 2002 at 8:37, John Polstra wrote:
> In article <20020604012638.7CCF63F3A@bast.unixathome.org>,
> Dan Langille <dan@langille.org> wrote:
> > Folks, I'm having trouble understanding this problem. I'm trying to use
> > cvsup to get stuff onto my website. This supfile gets things out of the
> > tree
> >
> > $ less ~/phpAdsNew-supfile
> > *default host=xeon
> > *default base=/usr/websites/freshports
> > *default release=cvs
> > *default delete use-rel-suffix
> > *default umask=007
> > *default preserve
> > *default tag=.
> > freshports-phpAds
> >
> > But what I really want is tag=FreshPorts2 but if I use that, I don't get
> > anything out of the repo.
> >
> > The tags exist:
> >
> > However, for example:
> >
> > $ cvs stat -v ChangeLog
> > ===================================================================
> > File: ChangeLog Status: Up-to-date
> >
> > Working revision: 1.1.1.1 Tue Jun 4 01:01:32 2002
> > Repository revision: 1.1.1.1 /home/repositories/freshports-
> > 1/phpPgAds/ChangeLog,v
> > Sticky Tag: FreshPorts2 (revision: 1.1.1.1)
> > Sticky Date: (none)
> > Sticky Options: (none)
> >
> > Existing Tags:
> > cvs (revision: 1.1.1.1)
> > FreshPorts2 (revision: 1.1.1.1)
> >
> >
> > I just don't get it. Why doesn't tag=FreshPorts2 work?
>
> You should get rid of the "preserve" keyword in your supfile. It
> doesn't really make any sense when working in checkout mode. But
> that's probably not the problem.
>
> I'll help you figure this out if you'll send me the following
> information:
Thanks John.
>
> The cvsupd server config files for the collection ("releases"
> and the list file).
[dan@xeon:/home/repositories/sup/freshports-phpAds] $ less list.cvs
upgrade phpPgAds
[dan@xeon:/home/repositories/sup/freshports-phpAds] $ less releases
cvs list=list.cvs prefix=/home/repositories/freebsddiary
> The full pathnames of the cvsupd server config files for the
> collection.
Is that obvioius form the pwd above?
> The command line used to invoke cvsupd.
from /etc/inetd.conf:
cvspserver stream tcp nowait root /usr/bin/cvs cvs --allow-
root=/home/repo --allow-root=/home/repositories/freebsddiary --allow-
root=/home/cvs-scripts --allow-root=/home/repositories/freshports-1 --
allow-root=/home/repositories/websites pserver
> The full pathname of the ChangeLog RCS file you used as your
> example, on the server machine.
/home/repositories/freshports-1/phpPgAds/ChangeLog,v
> The output of "rlog -h ChangeLog,v" on that file on the server.
[dan@xeon:/home/repositories/freshports-1/phpPgAds] $ rlog -h ChangeLog,v
RCS file: ChangeLog,v
Working file: ChangeLog
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
cvs: 1.1.1.1
FreshPorts2: 1.1.1.1
keyword substitution: kv
total revisions: 2
----------------------------
===========================================================================
==
> The command line used to invoke cvsup on the client machine.
[dan@nezlok:/usr/websites/traffic] $ cvsup ~/phpAdsNew-supfile
Connected to localhost
Updating collection freshports-phpAds/cvs
Finished successfully
[dan@nezlok:/usr/websites/traffic] $
> The output of
> find /usr/websites/freshports/sup -name 'refuse*'
> on the client machine.
$ find /usr/websites/freshports/sup -name 'refuse*'
find: /usr/websites/freshports/sup: No such file or directory
$ find /usr/websites/freshports.org/sup -name 'refuse*'
/usr/websites/freshports.org/sup/freshports-www/refuse
/usr/websites/freshports.org/sup/freshports-www/refuse~
/usr/websites/freshports.org/sup/freshports-config/refuse
$
refuse files from above in case they are useful:
$ less /usr/websites/freshports.org/sup/freshports-www/refuse
www/phorum
$ less /usr/websites/freshports.org/sup/freshports-config/refuse
configuration/phorum
configuration/phorum-3.3.2a/1.php
configuration/phorum-3.3.2a/2.php
configuration/phorum-3.3.2a/forums.php
> The output of "cvsup -v" on the client and "cvsupd -v" on the
> server. Please be careful to ensure that your PATH is really
> finding the same copies of these programs that your cron job or
> other mechanism normally executes.
Client: $ cvsup -v
CVSup client, non-GUI version
Copyright 1996-2002 John D. Polstra
Software version: SNAP_16_1f
Protocol version: 17.0
Operating system: FreeBSD4
http://www.polstra.com/projects/freeware/CVSup/
Report problems to cvsup-bugs@polstra.com
CVSup is a registered trademark of John D. Polstra
Server: $ /usr/local/sbin/cvsupd -v
CVSup server
Copyright 1996-2002 John D. Polstra
Software version: SNAP_16_1f
Protocol version: 17.0
Operating system: FreeBSD4
http://www.polstra.com/projects/freeware/CVSup/
Report problems to cvsup-bugs@polstra.com
CVSup is a registered trademark of John D. Polstra
--
Dan Langille
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020604222322.E371E3F3A>