[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: CODING_STYLE (was Re: [PATCHv2] qemu: target library, u
[Qemu-devel] Re: CODING_STYLE (was Re: [PATCHv2] qemu: target library, use it in msix)
Thu, 01 Oct 2009 09:08:42 +0200
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:184.108.40.206) Gecko/20090814 Fedora/3.0-2.6.b3.fc11 Lightning/1.0pre Thunderbird/3.0b3
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
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
Re: [Qemu-devel] Re: CODING_STYLE (was Re: [PATCHv2] qemu: target library, use it in msix), Avi Kivity, 2009/10/01