From owner-svn-src-head@FreeBSD.ORG Thu Aug 19 20:12:42 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 946101065695; Thu, 19 Aug 2010 20:12:42 +0000 (UTC) (envelope-from juli@clockworksquid.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 8E1C08FC0C; Thu, 19 Aug 2010 20:12:41 +0000 (UTC) Received: by wyj26 with SMTP id 26so3052811wyj.13 for ; Thu, 19 Aug 2010 13:12:40 -0700 (PDT) Received: by 10.216.71.132 with SMTP id r4mr1107651wed.102.1282248760461; Thu, 19 Aug 2010 13:12:40 -0700 (PDT) MIME-Version: 1.0 Sender: juli@clockworksquid.com Received: by 10.216.5.5 with HTTP; Thu, 19 Aug 2010 13:12:20 -0700 (PDT) In-Reply-To: <20100819.131658.84240036293427615.imp@bsdimp.com> References: <4C6D6FD7.7060106@freebsd.org> <20100819.124258.885796242215807555.imp@bsdimp.com> <4C6D80A0.4080901@freebsd.org> <20100819.131658.84240036293427615.imp@bsdimp.com> From: Juli Mallett Date: Thu, 19 Aug 2010 13:12:20 -0700 X-Google-Sender-Auth: XaWFq_nWE_erNbkJlwo_E-NmRCA Message-ID: To: "M. Warner Losh" 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 20:12:42 -0000 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 we 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. 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. 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 generating 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. Juli.