Date: Mon, 05 Apr 2010 04:49:39 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: yanefbsd@gmail.com Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, avg@FreeBSD.org Subject: Re: svn commit: r206176 - head/share/examples/indent Message-ID: <20100405.044939.260300876916215875.imp@bsdimp.com> In-Reply-To: <t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com> References: <201004050926.o359Q3Sm086401@svn.freebsd.org> <t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com>
Garrett Cooper <yanefbsd@gmail.com> writes:
: On Mon, Apr 5, 2010 at 2:26 AM, Andriy Gapon <avg@freebsd.org> wrote:
: > Author: avg
: > Date: Mon Apr 5 09:26:03 2010
: > New Revision: 206176
: > URL: http://svn.freebsd.org/changeset/base/206176
: >
: > Log:
: > indent.pro example: put all options one per line
: >
: > This should help with modification tracking.
: >
: > Discussed with: bde
: > MFC after: 7 days
: >
: > Modified:
: > head/share/examples/indent/indent.pro
: >
: > Modified: head/share/examples/indent/indent.pro
: > ==============================================================================
: > --- head/share/examples/indent/indent.pro Mon Apr 5 09:24:24 2010 (r206175)
: > +++ head/share/examples/indent/indent.pro Mon Apr 5 09:26:03 2010 (r206176)
: > @@ -14,5 +14,33 @@
: > -TSTAILQ_ENTRY
: > -TSLIST_HEAD
: > -TSLIST_ENTRY
: > --bad -bap -nbbb -nbc -br -nbs -c41 -cd41 -cdb -ce -ci4 -cli0 -d0 -di8 -ndj
: > --ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -ta -nv
: > +-bad
: > +-bap
: > +-nbbb
: > +-nbc
: > +-br
: > +-nbs
: > +-c41
: > +-cd41
: > +-cdb
: > +-ce
: > +-ci4
: > +-cli0
: > +-d0
: > +-di8
: > +-ndj
: > +-ei
: > +-nfc1
: > +-nfcb
: > +-i8
: > +-ip8
: > +-l79
: > +-lc77
: > +-ldi0
: > +-nlp
: > +-npcs
: > +-psl
: > +-sc
: > +-nsob
: > +-ta
: > +-nv
:
: Isn't doing something like this going to make merge collisions
: more prevalent?
Actually, it will allow merging more easily. If I wanted to add -nld
to the list and joe wanted to add -l4d, then those would be on lines
by themselves (which makes merging easier) rather than on the same
line (which makes merging impossible with today's tools).
Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100405.044939.260300876916215875.imp>