[MPlayer-cvslog] CVS: main mencoder.c,1.278,1.279

[Dominik 'Rathann' Mierzejewski]

On Wednesday, 06 April 2005 at 15:19, Diego Biurrun wrote:
> On Wed, Apr 06, 2005 at 01:43:37PM +0200, Dominik 'Rathann' Mierzejewski wrote:
> > On Wednesday, 06 April 2005 at 09:58, Diego Biurrun CVS wrote:
> > > 
> > > -        mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
> > > -	mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenDemuxer); //correct target/level? FIXME?
> > > +    mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_FormatNotRecognized);
> > > +    mp_msg(MSGT_DEMUXER, MSGL_FATAL, MSGTR_CannotOpenDemuxer);
> > 
> > Why are you breaking CVS rules and commiting whitespace changes?
> 
> It's not a whitespace-only commit, I changed both lines.  Before they were
> indented with random(), the first used 8 spaces, the second one tab at the
> second level of indentation and everything around is using something
> completely different.
> 
> So what is the problem?  cvs annotate will show my name right beside those
> lines due to non-whitespace changes and the commit is not hard(er) to
> review, it's two lines after all...

I agree it's not a problem in this particular case, but...

> Granted, the CVS policy is ambiguous about this, but I never interpreted it
> to forbid this kind of changes, have you?  Why do you oppose this?

...the CVS policy is "do not mix cosmetic changes with functional changes".
So, to follow it to the letter, you'd make two commits instead of one.

Though I'm just splitting hairs here...

Regards,
R.

-- 
MPlayer RPMs maintainer: http://rpm.greysector.net/mplayer/
"I am Grey. I stand between the candle and the star. We are Grey.
 We stand between the darkness ... and the light."
        -- Delenn in Grey Council in Babylon 5:"Babylon Squared"