Date: Thu, 19 Aug 2010 13:12:20 -0700 From: Juli Mallett <jmallett@FreeBSD.org> To: "M. Warner Losh" <imp@bsdimp.com> 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 Message-ID: <AANLkTim4dRH4sHQMaR-5TKvPWmmUDX%2B7DMqJjC=yPSEh@mail.gmail.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Aug 19, 2010 at 12:16, M. Warner Losh <imp@bsdimp.com> 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTim4dRH4sHQMaR-5TKvPWmmUDX%2B7DMqJjC=yPSEh>