From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MtFmU-0001IQ-35
	for qemu-devel@nongnu.org; Thu, 01 Oct 2009 03:08:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MtFmS-0001IE-Lk
	for qemu-devel@nongnu.org; Thu, 01 Oct 2009 03:08:48 -0400
Received: from [199.232.76.173] (port=33634 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MtFmS-0001IB-Gf
	for qemu-devel@nongnu.org; Thu, 01 Oct 2009 03:08:48 -0400
Received: from mx20.gnu.org ([199.232.41.8]:26446)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <paolo.bonzini@gmail.com>)
	id 1MtFmR-0005FK-VA
	for qemu-devel@nongnu.org; Thu, 01 Oct 2009 03:08:48 -0400
Received: from fg-out-1718.google.com ([72.14.220.157])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <paolo.bonzini@gmail.com>) id 1MtFmR-00057w-9e
	for qemu-devel@nongnu.org; Thu, 01 Oct 2009 03:08:47 -0400
Received: by fg-out-1718.google.com with SMTP id d23so2231692fga.10
	for <qemu-devel@nongnu.org>; Thu, 01 Oct 2009 00:08:45 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <4AC4557A.7000301@gnu.org>
Date: Thu, 01 Oct 2009 09:08:42 +0200
From: Paolo Bonzini <bonzini@gnu.org>
MIME-Version: 1.0
References: <20090923200635.GA21246@redhat.com>	<f43fc5580909241050jc8b82fbsb25eef096f8105eb@mail.gmail.com>	<20090924191121.GB29419@redhat.com>	<f43fc5580909241313s64f14688he6cdb23e2bc2edfb@mail.gmail.com>	<20090929161115.GA13885@redhat.com>	<f43fc5580909291115y4ac36d4bja3a9bb5937312e44@mail.gmail.com>	<20090930135142.GA20378@redhat.com>
	<4AC38EA4.70700@redhat.com>	<f43fc5580909301029u1b777f9fhb114cf3e313f671b@mail.gmail.com>	<4AC44CB4.8060006@redhat.com>
	<20091001064745.GA5687@redhat.com>
In-Reply-To: <20091001064745.GA5687@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: CODING_STYLE (was Re: [PATCHv2] qemu: target
 library, use it in msix)
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>, Avi Kivity <avi@redhat.com>, qemu-devel@nongnu.org


>>> True, but with 'indent' support the pain would be brief.
>>>
>>
>> External trees (qemu-kvm, the Xen tree, distros which carry patches)
>> will all have to adapt, just so that we can reach 80 columns twice as
>> quickly.
>
> Can external trees just run indent themselves before merging upstream?

That does not help merging.  You have "git blame -w" but not "git merge -w".

You can run a huge "git merge -s ours" (or add a jumbo patch to the 
distribution), but you still have to make sure you do not introduce 
spacing differences WRT upstream, or _future_ conflicts will be even worse.

Personally I believe it is not worth it.  I think that incremental 
updates to the coding style are enough, and not too bad if we go on with 
4-space soft tabs; whipping up a version of checkpatch that supports 
4-space indent should not be hard.

Which means, you do not need to do much besides deciding how you want 
the braces.

Paolo