From owner-freebsd-ports@FreeBSD.ORG Wed Aug 31 08:50:11 2011 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE73A106564A for ; Wed, 31 Aug 2011 08:50:11 +0000 (UTC) (envelope-from conrads@cox.net) Received: from eastrmfepo202.cox.net (eastrmfepo202.cox.net [68.230.241.217]) by mx1.freebsd.org (Postfix) with ESMTP id 48A018FC18 for ; Wed, 31 Aug 2011 08:50:10 +0000 (UTC) Received: from eastrmimpo01.cox.net ([68.1.16.119]) by eastrmfepo202.cox.net (InterMail vM.8.01.04.00 201-2260-137-20101110) with ESMTP id <20110831085010.FDHE32466.eastrmfepo202.cox.net@eastrmimpo01.cox.net>; Wed, 31 Aug 2011 04:50:10 -0400 Received: from serene.no-ip.org ([98.164.83.25]) by eastrmimpo01.cox.net with bizsmtp id Swq91h00F0YnB6A02wqA7X; Wed, 31 Aug 2011 04:50:10 -0400 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A02020A.4E5DF5C2.00BB,ss=1,re=0.000,fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=1.1 cv=5AHg1zS6fKBk64vkGL/stHpTKznySuNzRq0QOAs0BF0= c=1 sm=1 a=-pwuJQO3sf0A:10 a=G8Uczd0VNMoA:10 a=kj9zAlcOel0A:10 a=2vO5UZG1h46htWAnE/rx2g==:17 a=pGLkceISAAAA:8 a=kviXuzpPAAAA:8 a=W-qyeiMjH2dNeHUwBn4A:9 a=ouG4ARSO6WSsNT7HlfsA:7 a=CjuIK1q_8ugA:10 a=MSl-tDqOz04A:10 a=4vB-4DCPJfMA:10 a=2vO5UZG1h46htWAnE/rx2g==:117 X-CM-Score: 0.00 Authentication-Results: cox.net; none Received: from cox.net (localhost [127.0.0.1]) by serene.no-ip.org (8.14.5/8.14.5) with ESMTP id p7V8o9QC091396; Wed, 31 Aug 2011 03:50:09 -0500 (CDT) (envelope-from conrads@cox.net) Date: Wed, 31 Aug 2011 03:50:04 -0500 From: "Conrad J. Sabatier" To: Chris Rees Message-ID: <20110831035004.600ed21c@cox.net> In-Reply-To: References: <20110830195114.56a8f255@cox.net> X-Mailer: Claws Mail 3.7.10 (GTK+ 2.24.5; amd64-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: freebsd-ports@freebsd.org Subject: Re: (maintainer question) Possible bug in cvs: cvs diff -uN: -N switch being ignored (disappearing, actually) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Aug 2011 08:50:11 -0000 On Wed, 31 Aug 2011 09:17:52 +0100 Chris Rees wrote: > On 31 Aug 2011 01:51, "Conrad J. Sabatier" wrote: > > > > Odd little problem here I'm noticing with cvs. > > > > When I do a "cvs diff -uN", for some reason the -N switch is being > > ignored. It vanishes completely in the header of the resulting > > output. I've been trying to rename one of my patch files to > > conform to portlint's recommendations, but unless I can get -N to > > work properly, this is a no-go. Whether I add 'cvs diff -uN' to > > my .cvsrc, or explicitly add it at the command line, makes no > > difference. > > > > For instance: > > > > [root@serene /usr/ports/net-p2p/lopster]# cvs diff -uN > > cvs diff: Diffing . > > Index: Makefile > > =================================================================== > > RCS file: /home/ncvs/ports/net-p2p/lopster/Makefile,v > > retrieving revision 1.44 > > diff -u -r1.44 Makefile > > ^ > > |__ What happened to -N? > > > > [snip remainder of diff output] > > > > Incidentally, this problem started before I upgraded two days ago > > from 9.0-BETA1 to 9.0-BETA1, so it's not OS version-related. > > > > Any idea what could be causing this and how to correct it? Is this > > a bug in cvs? Should I send-pr it? > > Did you remember to cvs add / rm the files you're adding/removing? Do > you know what -N does? > > Chris Well, I'm using a local copy of the FreeBSD CVS repository which I maintain via csup (from which I do checkouts/updates of /usr/{doc,ports,src}, so I don't try to do anything that modifies the repo, but I do like having it around to check log messages and, in the case of ports maintenance, to create patches. If I understand correctly, the -N switch to cvs diff should note if a file has been removed or a new file added, or am I mistaken? At any rate, doesn't it seem peculiar that the switch would just be silently dropped like this? Anyway, while we're on the subject: since I don't have any commit privileges (I suppose I could change that on my local copy of the repo, but I prefer to keep it in a pristine "official" state), what *is* the proper way to create a diff/patch that incorporates new files, or renames/deletes old ones? I understand the add/rm functions, having used them on my own personal cvs repo that I use for software projects I'm hacking on, but in dealing with the official repo, some other approach is needed, I think. Thanks. -- Conrad J. Sabatier conrads@cox.net