Re: pkg/51485

["J. Lewis Muir" <jlmuir%imca-cat.org@localhost>]

The following reply was made to PR pkg/51485; it has been noted by GNATS.

From: "J. Lewis Muir" <jlmuir%imca-cat.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/51485
Date: Thu, 3 Nov 2016 16:55:50 -0500

 I have the same problem using CVS.  For example, a checkout results in a
 conflict:
 
   $ cvs -z2 -d anoncvs%anoncvs.NetBSD.org@localhost:/cvsroot checkout -P pkgsrc/www/seamonkey/patches
   [snip]
   U pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.S
   cvs checkout: move away `pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.s'; it is in the way
   C pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.s
   [snip]
 
 And every time I check the status, I get an indication that the .s file
 was updated:
 
   $ cd pkgsrc
   $ cvs -n update
   cvs update: Updating .
   cvs update: Updating www
   cvs update: Updating www/seamonkey
   cvs update: Updating www/seamonkey/patches
   U www/seamonkey/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.s
 
 Thanks!
 
 Lewis