From owner-cvs-all  Thu Sep  6  8: 3:19 2001
Delivered-To: cvs-all@freebsd.org
Received: from rover.village.org (rover.bsdimp.com [204.144.255.66])
	by hub.freebsd.org (Postfix) with ESMTP
	id C0B9F37B407; Thu,  6 Sep 2001 08:03:11 -0700 (PDT)
Received: from harmony.village.org (harmony.village.org [10.0.0.6])
	by rover.village.org (8.11.3/8.11.3) with ESMTP id f86F39X28395;
	Thu, 6 Sep 2001 09:03:10 -0600 (MDT)
	(envelope-from imp@harmony.village.org)
Received: from harmony.village.org (localhost.village.org [127.0.0.1])
	by harmony.village.org (8.11.3/8.11.4) with ESMTP id f86F38h53747;
	Thu, 6 Sep 2001 09:03:08 -0600 (MDT)
	(envelope-from imp@harmony.village.org)
Message-Id: <200109061503.f86F38h53747@harmony.village.org>
To: Bruce Evans <bde@zeta.org.au>
Subject: Re: cvs commit: src/sys/dev/gx if_gx.c 
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
In-reply-to: Your message of "Thu, 06 Sep 2001 20:20:53 +1000."
		<20010906201939.A30311-100000@alphplex.bde.org> 
References: <20010906201939.A30311-100000@alphplex.bde.org>  
Date: Thu, 06 Sep 2001 09:03:08 -0600
From: Warner Losh <imp@harmony.village.org>
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

In message <20010906201939.A30311-100000@alphplex.bde.org> Bruce Evans writes:
: I thought you knew better :-).  Commit the bits that work in RELENG_N to
: RELENG_N, not an ifdef tangle to all branches.

When I'm actively merging, having a few ifdefs at the top of the file
helps save me a lot of time.  If there are more than a few, I agree.

Warner


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