Subject: Re: CVSup/CVS issues?
To: Julian Coleman <jdc@coris.org.uk>
From: Nino Dehne <usenet-2005-01-b07e88f7@0x54434D.net>
List: netbsd-help
Date: 01/10/2005 23:02:08
On Mon, Jan 10, 2005 at 02:20:27PM +0000, Julian Coleman wrote:
> > Edit src/sys/dev/pci/if_wm.c
> > Edit src/sys/dev/pci/if_wmreg.h
>
> Can you make sure you have:
>
> src/sys/dev/pci/if_wm.c revision 1.68.2.5
> src/sys/dev/pci/if_wmreg.h revision 1.10.2.2
>
> as there was a merge error in the previous revisions on the netbsd-2-0
> branch.
I still get
/* $NetBSD: if_wm.c,v 1.68.2.3 2004/07/16 21:21:07 he Exp $ */
/* $NetBSD: if_wmreg.h,v 1.10 2004/02/19 05:19:52 thorpej Exp $ */
when checking out netbsd-2-0 via CVSup from grappa.unix-ag.uni-kl.de.
I'm trying CVS directly from anoncvs.netbsd.org now. A quick checkout
of those two files gave me the revisions you listed. Must be some additional
hiccup over there at grappa.unix-ag.uni-kl.de. *shrug*
I included the maintainer in Cc.
ND
--
Of course it runs NetBSD.