Re: CVS tags (was Re: [Prism54-devel] Re: [PATCH 4/14 linux-2.6.7-rc1] prism54: add support for avs header in

From: Andreas Dilger
Date: Thu May 27 2004 - 15:03:28 EST


On May 27, 2004 15:31 -0400, Valdis.Kletnieks@xxxxxx wrote:
> On Thu, 27 May 2004 15:16:49 EDT, Luis R. Rodriguez said:
> > --- ksrc/islpci_eth.c
> > +++ ksrc-new/islpci_eth.c
>
> I think this was what he referred to:
>
> >-/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.31 2004/03 15:27:44 ajfa Exp $
> >+/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.33 2004/03/19 23:03:58 ajfa Exp $
>
> as this will almost surely cause rejects (sooner or later) unless 100% of your
> patches are applied and in the right order.

This also causes grief if this file is ever imported again into a CVS-based
SCM, unless you remember to do so with -ko.

Cheers, Andreas
--
Andreas Dilger
http://sourceforge.net/projects/ext2resize/
http://www-mddsp.enel.ucalgary.ca/People/adilger/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/