From owner-svn-src-all@FreeBSD.ORG  Mon Apr  5 11:02:11 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E992106566B;
	Mon,  5 Apr 2010 11:02:11 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 00E8E8FC13;
	Mon,  5 Apr 2010 11:02:10 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o35As4AN092959;
	Mon, 5 Apr 2010 04:54:05 -0600 (MDT) (envelope-from imp@bsdimp.com)
Date: Mon, 05 Apr 2010 04:49:39 -0600 (MDT)
Message-Id: <20100405.044939.260300876916215875.imp@bsdimp.com>
To: yanefbsd@gmail.com
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com>
References: <201004050926.o359Q3Sm086401@svn.freebsd.org>
	<t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com>
X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
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
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Apr 2010 11:02:11 -0000

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 =A05 09:26:03 2010
: > New Revision: 206176
: > URL: http://svn.freebsd.org/changeset/base/206176
: >
: > Log:
: > =A0indent.pro example: put all options one per line
: >
: > =A0This should help with modification tracking.
: >
: > =A0Discussed with: =A0 =A0 =A0 bde
: > =A0MFC after: =A0 =A07 days
: >
: > Modified:
: > =A0head/share/examples/indent/indent.pro
: >
: > Modified: head/share/examples/indent/indent.pro
: > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
: > --- head/share/examples/indent/indent.pro =A0 =A0 =A0 Mon Apr =A05 =
09:24:24 2010 =A0 =A0 =A0 =A0(r206175)
: > +++ head/share/examples/indent/indent.pro =A0 =A0 =A0 Mon Apr =A05 =
09:26:03 2010 =A0 =A0 =A0 =A0(r206176)
: > @@ -14,5 +14,33 @@
: > =A0-TSTAILQ_ENTRY
: > =A0-TSLIST_HEAD
: > =A0-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 -nso=
b -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