svn commit: r211503 - head/sys/mips/atheros

[M. Warner Losh]

In message: <AANLkTim4dRH4sHQMaR-5TKvPWmmUDX+7DMqJjC=yPSEh at mail.gmail.com>
            Juli Mallett <jmallett at FreeBSD.ORG> writes:
: On Thu, Aug 19, 2010 at 12:16, M. Warner Losh <imp at bsdimp.com> wrote:
: > Branching is a lot easier and saner.  But 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.

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 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.

Yea, perforce will generate mail only for those that opt in...

Warner