From owner-freebsd-current Tue Oct 8 16:10:43 2002 Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C54C37B401; Tue, 8 Oct 2002 16:10:42 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E48F43E4A; Tue, 8 Oct 2002 16:10:42 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 247562A88D; Tue, 8 Oct 2002 16:10:42 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: obrien@FreeBSD.org Cc: John Baldwin , Alexander Kabaev , current@FreeBSD.org, Dag-Erling Smorgrav Subject: Re: i386 tinderbox failure In-Reply-To: <20021008224042.GA13880@dragon.nuxi.com> Date: Tue, 08 Oct 2002 16:10:42 -0700 From: Peter Wemm Message-Id: <20021008231042.247562A88D@canning.wemm.org> Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG "David O'Brien" wrote: > On Tue, Oct 08, 2002 at 03:55:36PM -0400, John Baldwin wrote: > > Could you please just commit this on the vendor branch if it is the > > vendor fix for now. Since the next vendor import will contain the > > fix you don't need to worry about maintaining the local patch so > > committing it onto the vendor branch is ok. > > Doing this screws up diffs to vendor source as there won't be a tag that > corisponds with this across all files. For small contribed things that > is OK. But when doing large ones it the following import+merge becomes > harder. While that is true, it usually isn't all that big a deal if you are careful and keep track of what you've done. It is certainly better than causing the file to leave the vendor branch for something you *know* is now in the vendor tree. And I think its better than leaving a known 'compiler crash' case there to bite developers. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message