Date: Thu, 19 Aug 2010 15:08:24 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: jmallett@freebsd.org 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: <20100819.150824.1004138037722500360.imp@bsdimp.com> In-Reply-To: <AANLkTim4dRH4sHQMaR-5TKvPWmmUDX%2B7DMqJjC=yPSEh@mail.gmail.com> References: <4C6D80A0.4080901@freebsd.org> <20100819.131658.84240036293427615.imp@bsdimp.com> <AANLkTim4dRH4sHQMaR-5TKvPWmmUDX%2B7DMqJjC=yPSEh@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <AANLkTim4dRH4sHQMaR-5TKvPWmmUDX+7DMqJjC=3DyPSEh@mail.gmail=
.com>
Juli Mallett <jmallett@FreeBSD.ORG> writes:
: 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 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100819.150824.1004138037722500360.imp>