yikes, I did this too.  perhaps thats why you got a conflict...


On Fri, 12 May 2000, Hubert Feyrer wrote:

> On Thu, 11 May 2000, Hubert Feyrer wrote:
> > Using cvs import because of this:
> > smaug% cvs add patches
> > cvs [add aborted]: cannot make directory CVS in patches: Permission denied
> > 
> > New fun every day...
> > 
> > Status:
> > 
> > Vendor Tag:	TNF
> > Release Tags:	pkgsrc-base
> > 		
> > C pkgsrc/sysutils/xps/patches/patch-aa
> 
> It seems that this was because of the file being already there, and cvs
> not warning properly. All's fine again now.
> 
> 
>  - Hubert
> 
> -- 
> NetBSD - because Unix isn't just #include <linux.h>, i386, ELF, ...!
>