From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IXDPY-0001Vb-DY for qemu-devel@nongnu.org; Mon, 17 Sep 2007 06:01:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IXDPU-0001SX-K2 for qemu-devel@nongnu.org; Mon, 17 Sep 2007 06:00:59 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IXDPU-0001SC-A9 for qemu-devel@nongnu.org; Mon, 17 Sep 2007 06:00:56 -0400 Received: from mail.gmx.net ([213.165.64.20]) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1IXDPT-0007O8-LJ for qemu-devel@nongnu.org; Mon, 17 Sep 2007 06:00:55 -0400 Date: Mon, 17 Sep 2007 11:00:08 +0100 (BST) From: Johannes Schindelin Subject: Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae... In-Reply-To: <1190022138.14938.153.camel@rapid> Message-ID: References: <1190016521.14938.148.camel@rapid> <46d6db660709170127t415b3a06vbef6c5dd19cd172f@mail.gmail.com> <1190022138.14938.153.camel@rapid> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "J. Mayer" Cc: qemu-devel@nongnu.org Hi, On Mon, 17 Sep 2007, J. Mayer wrote: > On Mon, 2007-09-17 at 10:27 +0200, Christian MICHON wrote: > > On 9/17/07, J. Mayer wrote: > > > > Log message: > > > > find -type f | xargs sed -i 's/[\t ]$//g' # on most files > > > > > > Many thanks for generating hundreds of conflicts with a useless commit. > > > Don't know what's wrong in your expression but it did not what you think > > > it should (and you did not even check....). > > > > > > DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE. > > > > > > > if we were using git (but you can do it locally anyway), you would not > > have these conflicts problems... > > Maybe... but Savannah uses a CVS frontend, as far as I know... Those are excuses. Savannah has git support, for example, and you can use git to commit to cvs, too. > > git-apply indead has this feature about ignoring useless whitespaces... > > It does not seem a good idea that tools modify the code in our back. Huh? You said that merging gave you a lot of conflicts. What exactly do you describe the operation of that merge, then? Of course, I would not blindly run a merge with whitespace munging. But then, I don't have to. I can run it without, and when I realise that there are whitespace conflicts, I can _rerun_ it with those options. > Better learn people (including me...) not to write/commit incorrect > code... Haha. Good one. ;-) > Should also learn people not to break other's code, but that seems far > to difficult to understand.... Like whitespace change is breaking your code. Really, I mean, come on. Who do think you are kidding? Ciao, Dscho