Date: Mon, 31 Mar 1997 20:55:16 +0100 From: Brian Somers <brian@awfulhak.org> To: obrien@NUXI.com Cc: Brian Somers <brian@awfulhak.org>, Brian Somers <brian@freefall.freebsd.org>, CVS-committers@freebsd.org, cvs-ports@freebsd.org Subject: Re: cvs commit: ports/net/netcat - Imported sources Message-ID: <199703311955.UAA14396@awfulhak.demon.co.uk> In-Reply-To: Your message of "Mon, 31 Mar 1997 09:23:22 -0800." <19970331092322.03627@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Mon, Mar 31, 1997 at 02:32:20PM +0100, Brian Somers wrote:
> > Sorry - I didn't see it (and still can't) - where is it ?
> > $ cd /usr/ports
> > $ echo */net* */nc
> > doesn't come up with anything of interest.
>
>
> /usr/ports on which machine? freefall:/usr/ports/net has it... BUT more
> imporatantly freefall:/home/ncvs/ports/net has it.
Ah. I made this port at work on a 961014-SNAP machine and completely
failed to notice it was already on my -current machine at home *blush*.
Sorry. I mucked around doing "cvs import" on my home machine to
make sure I didn't screw up too badly, then removed
$CVSROOT/ports/net/netcat.... but obviously not necessarily in that
order for netcat.
It's nice to have an example of what I should have done - nearly got
it right :)
How do I back this out ? Do I get all the revision 1.1.1.1s and write
them as new revisions (1.1.1.3), then cvs rm the patches stuff - or
is there a more subtle way ?
> > > You aren't using ``easy-import'' are you? I can't check out
> > > ports/net/arpwatch:
> > >
> > > freefall:~/ports/net> cvs co arpwatch
> > > cvs checkout: cannot find module `arpwatch' - ignored
> >
> > Works ok for me.
> >
> > freefall:~brian $ cvs co ports/net/arpwatch
>
> Yes, but you didn't commit it the the CVSROOT/modules database. So
> checking it out by module name doesn't work. You can ``cvs co modules''
> and add it easily.
Hey, that's neat. I didn't know you could do that. So everything
on the left hand side of "modules" can be "cvs co"d rather than
typing in the long version on the right hand side :)
[.....]
> > I havn't updated net/Makefile yet - I thought I'd cringe for a while
> > before breaking the world.
>
> Go ahead and update it. arpwatch built fine for me.
Will do.
> > BTW, what's ``easy-import'' ?
>
> It is a nice perl script that Joerg wrote. It is in
> /usr/share/examples/cvs/contrib on all machines, and /usr/local/bin on
> freefall. It keeps you from commiting in the wrong place (ie. keeps you
> to src, ports, www, etc). And w/in ports keeps you w/in the existing
> categories. It will check to see if the thing you are importing is
> already their, check out the modules database and update. Then it does
> the import on the vendor branch. You would use it for adding ports, and
> contrib software.
>
> Enjoy!
>
> --
> -- David (obrien@NUXI.com -or- obrien@FreeBSD.org)
>
Thanks - I'll take a look.
--
Brian <brian@awfulhak.org>, <brian@freebsd.org>
<http://www.awfulhak.demon.co.uk/>;
Don't _EVER_ lose your sense of humour....
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199703311955.UAA14396>