Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

[Johannes Schindelin]

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 <address@hidden> 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