From owner-freebsd-hackers@FreeBSD.ORG Wed Sep 7 16:23:43 2005 Return-Path: X-Original-To: freebsd-hackers@freebsd.org Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 811F016A41F for ; Wed, 7 Sep 2005 16:23:43 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3011C43D48 for ; Wed, 7 Sep 2005 16:23:43 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j87GNYr1028357; Wed, 7 Sep 2005 09:23:34 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j87GNYaV028355; Wed, 7 Sep 2005 09:23:34 -0700 Date: Wed, 7 Sep 2005 09:23:34 -0700 From: Brooks Davis To: Gordon Bergling Message-ID: <20050907162334.GB19958@odin.ac.hmc.edu> References: <20050907133239.GA53278@node26.0xfce3.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="GRPZ8SYKNexpdSJ7" Content-Disposition: inline In-Reply-To: <20050907133239.GA53278@node26.0xfce3.net> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Cc: freebsd-hackers@freebsd.org Subject: Re: how to handling read only cvs trees X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2005 16:23:43 -0000 --GRPZ8SYKNexpdSJ7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 07, 2005 at 03:32:39PM +0200, Gordon Bergling wrote: > Hi, >=20 > I currently working to get an old patch up to HEAD, but I have a problem > with generating a diff from my work. >=20 > I usually checkout out src from a local cvs mirror of the FreeBSD > repository. I do this with >=20 > cvs -Rd/home/ncvs checkout src >=20 > Without the -R flag I must do the checkout as root to create a read > lock. >=20 > The changes are easly diff'ed with >=20 > cvs -Rd/home/ncvs checkout -uN > ../path/to/release.{patch|diff} >=20 > I added new files in existing directories with 'cvs add' so that > these files are included in the generated patch. >=20 > The problem I am faced with is that there are new directories with new > files (a lot) and these files are not included in the patch. I tried to > 'cvs add' the directories, but I am not allowed the create the > directories in /home/ncvs. Sure I just could fire up sudo to do the > work, but I am afraid that cvsup, which I use to mirror the cvs > repository, could delete them with the next scheduled run. >=20 > Has anyone a hint on how to handle this situation? Either pack the files up in a shar or tarball or use diff -N against /dev/null to create that part of the diff by hand. FWIW, CVS wouldn't do it for you even if you could add the files. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --GRPZ8SYKNexpdSJ7 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFDHxQFXY6L6fI4GtQRAmSDAJ0drO/q7FZrWMPYsFTiuhGOPJp/JACguJze ZWUsIwPeEFTLWOdecIoeG5o= =PCVn -----END PGP SIGNATURE----- --GRPZ8SYKNexpdSJ7--