Date: Sun, 4 Mar 2001 22:33:25 -0800 From: David O'Brien <TrimYourCc@nuxi.com> To: freebsd-stable@FreeBSD.ORG Subject: Re: Keeping track of Changes? Message-ID: <20010304223324.A36769@hub.freebsd.org> In-Reply-To: <20010304165708.A40747@mollari.cthul.hu>; from kris@obsecurity.org on Sun, Mar 04, 2001 at 04:57:08PM -0800 References: <004601c0a503$4ef3a850$0300a8c0@magus> <20010304165708.A40747@mollari.cthul.hu>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Mar 04, 2001 at 04:57:08PM -0800, Kris Kennaway wrote: > Personally, I save my commit messages which I know I want to merge at > some point in the future into a separate mfc folder, but another way > is to do something like: > > cvs diff -kk -u -r RELENG_4 -r HEAD | more This only works if you are in a -CURRENT /usr/src. "HEAD" for `cvs diff' refers to the head of the branch. In a RELENG_4 /usr/src, "HEAD" and "RELENG_4" are synomous. Don't you just _love_ CVS. I've been quite tempted to create a new keyword "TRUNK" to mean mainline "HEAD". -- -- David (obrien@FreeBSD.org) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010304223324.A36769>