From owner-freebsd-stable  Sun Mar  4 16:57:11 2001
Delivered-To: freebsd-stable@freebsd.org
Received: from obsecurity.dyndns.org (adsl-63-207-60-158.dsl.lsan03.pacbell.net [63.207.60.158])
	by hub.freebsd.org (Postfix) with ESMTP id 1F7CE37B718
	for <freebsd-stable@FreeBSD.ORG>; Sun,  4 Mar 2001 16:57:09 -0800 (PST)
	(envelope-from kris@obsecurity.org)
Received: by obsecurity.dyndns.org (Postfix, from userid 1000)
	id C9D9266B09; Sun,  4 Mar 2001 16:57:08 -0800 (PST)
Date: Sun, 4 Mar 2001 16:57:08 -0800
From: Kris Kennaway <kris@obsecurity.org>
To: William Wong <willwong@samurai.com>
Cc: freebsd-stable@FreeBSD.ORG
Subject: Re: Keeping track of Changes?
Message-ID: <20010304165708.A40747@mollari.cthul.hu>
References: <004601c0a503$4ef3a850$0300a8c0@magus>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-md5;
	protocol="application/pgp-signature"; boundary="gKMricLos+KVdGMg"
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <004601c0a503$4ef3a850$0300a8c0@magus>; from willwong@samurai.com on Sun, Mar 04, 2001 at 06:31:59PM -0500
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


--gKMricLos+KVdGMg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Mar 04, 2001 at 06:31:59PM -0500, William Wong wrote:
> Hi there,
>=20
> I'm just wondering how the developers keep track or what still needs to be
> merged from -CURRENT to -STABLE.  Is it just version numbers on particular
> files?

Well, it varies according to developer - but given the number of
un-merged changes that I found in the tree last night the general
answer might be "they don't" :-)

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=20

and look through the output (this shows all of the differences between
the two branches), then identify the commits giving rise to each of
the unmerged changes and patch them across if they should be merged.
This is how I did my big sweep last night (only covered about 1/2 the
tree, if I get time tonight I'll do more of the rest)

Kris

--gKMricLos+KVdGMg
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (FreeBSD)
Comment: For info see http://www.gnupg.org

iD8DBQE6ouRkWry0BWjoQKURAnBQAJ9t9XPe6ezjT7NqVxYkxYoLlW6DQgCfULzv
hn5eqDRTqaTwpnGUxyYuCs8=
=GL3v
-----END PGP SIGNATURE-----

--gKMricLos+KVdGMg--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message