From owner-svn-src-head@FreeBSD.ORG Thu Aug 19 21:11:51 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5BF610656A3; Thu, 19 Aug 2010 21:11:51 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 9F0888FC13; Thu, 19 Aug 2010 21:11:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o7JL8MTs000869; Thu, 19 Aug 2010 15:08:22 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 19 Aug 2010 15:08:24 -0600 (MDT) Message-Id: <20100819.150824.1004138037722500360.imp@bsdimp.com> To: jmallett@freebsd.org From: "M. Warner Losh" In-Reply-To: References: <4C6D80A0.4080901@freebsd.org> <20100819.131658.84240036293427615.imp@bsdimp.com> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, adrian@freebsd.org, src-committers@freebsd.org, andre@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r211503 - head/sys/mips/atheros X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2010 21:11:52 -0000 In message: Juli Mallett writes: : On Thu, Aug 19, 2010 at 12:16, M. Warner Losh wrote:= : > Branching is a lot easier and saner. =A0But there's still a cost to= : > branching that must be weighed... : = : As long as one isn't trying to be overly-clever in using the tools it= : really isn't so bad and is about as bad as Perforce. I don't think w= e : should ever use the merge command to merge commits to head from a : short-lived/non-vendor branch. It really sounds like you have had an= : unusually-bad experience with Subversion and I think we should try to= : dissect that rather than writing off developing in branches. The tbemd branch has been a pita to keep going as long as I've had to... : I haven't had any significant problems with merging from head to my : branch until I reached the level of having dozens of files and : directories added in my branch originally and then looped-back from : head. yea. I'll admit that part of my angst is from the projects/mips tree, which did get somewhat out of hand. : I, like Adrian, tend to do very sort of incremental work and lots of : little commits to break up my progress (and to have lots of points to= : revert to.) It has generally been my understanding that we frown on : doing that sort of thing in head. I don't see the point of generatin= g : an E-Mail to everyone who reads the commit lists to add a small, : unused header file, except in very occasional circumstances. I think= : that's a great level of detail to work at in a branch. Yea, perforce will generate mail only for those that opt in... Warner