[MPlayer-dev-eng] [PATCH] printf --> mp_msg transition (mplayer.c)

[Diego Biurrun]

The Wanderer writes:
> Diego Biurrun wrote:
> 
> > I suspect you are making your life harder than necessary by not using
> > CVS to its fullest.  Creating this patch should be no harder than
> > typing 'cvs diff -u mplayer.c mencoder.c help'.  Feel free to contact
> > me in private, I'll gladly help you out should you need some help.
> 
> Well, I did make things harder by forgetting that I could just specify
> the help/ directory, but the problem was actually that I had tried to
> create two separate independent patches - one for the two MSGTRs and one
> for the rest of the changes (since the former is not the same issue as
> the latter). As a result of that I had made a separate copy of mplayer.c
> in order to be able to make the diff against my modified version of the
> file, and when I later said "screw it" I forgot to copy the modified
> file back into the source tree.

Probably the easiest way to accomplish that is to make a quick copy of
your working directory, in case you don't have two already.  Having
two WDs is nice to have a clean "vanilla" working version and one you
can mess with to your heart's content.  Editing patches in emacs
should also work, it has a nice patch mode, I've often done this to
split up patches.

> (Speaking of not using CVS properly, I've just noticed a particular type
> of problem for the second time. If I do 'diff -u main/m_config.h
> main.working/m_config/.h', it reports a difference; if I do 'cvs diff -u
> m_config.h' from either source tree, it reports no differences. The last
> time I saw this, in order to get the local copies to sync up I had to
> remove the allegedly-changed file and have CVS think it'd gotten lost
> entirely. Any idea what might be going on?)

I'm in the dark here.  Maybe you have some sticky or something tags on
parts of your WD, these are known to cause obscure problems now and
then.  Try "cvs update -dPA" to reset them.

> (...and, on a complete tangent, why is help_mp.h in .cvsignore?? I
> certainly don't remember adding it to my local copy...)

help_mp.h is generated during the configure run.

> > I just noticed you are not yet in the AUTHORS file.  Time to send me
> > a patch for this ;)
> 
> Attached. I knew I wasn't in there, but I didn't think I'd done enough
> to warrant it yet; that is no longer the case, and if you hadn't brought
> it up by that point then I'd have most likely included a patch with my
> next submission.

Applied.

Diego