[FFmpeg-cvslog] Revert "build: move basic rules and variables to main Makefile"

[Reimar Döffinger]

On Fri, Jun 24, 2011 at 06:06:33PM +0200, Michael Niedermayer wrote:
> On Fri, Jun 24, 2011 at 11:51:52AM +0200, Reimar Döffinger wrote:
> > On 24 Jun 2011, at 10:39, Michael Niedermayer <michaelni at gmx.at> wrote:
> > > On Fri, Jun 24, 2011 at 09:54:40AM +0200, Reimar Döffinger wrote:
> > >> ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Fri Jun 24 09:02:57 2011 +0200| [2ec899222b3c90b3496a502175baac74cac1f564] | committer: Reimar Döffinger
> > >> 
> > >> Revert "build: move basic rules and variables to main Makefile"
> > >> 
> > >> This reverts commit bb5249244ddb22df1cfb8dee1c369e6cd653d00d.
> > >> This is necessary to allow running "make" in subdirs again.
> > > 
> > > this is full of bugs
> > > [...]
> > >> -BRIEF  = CC AS YASM AR LD HOSTCC STRIP CP
> > > [...]
> > >> +BRIEF  = CC AS YASM AR LD HOSTCC
> > > 
> > > heres one
> > 
> > So WTF does git revert do? It obviously doesn't revert the commit but does something random or what?
> 
> its not so easy to revert commits that move code when that moved
> code has been changed

Huh? You just make a git diff of that commit, apply it with revert
and then you have the old code.
I would have expected git revert to do exactly that and then this
wouldn't have happened, unless BRIEF was wrong all the time for
us and you only fixed in on the merge of that patch?!?
To me this sounds like we should add a "git revert is broken crap,
don't use it" to our documentation, or what am I missing?
To answer myself: I am obviously not getting how git merges work.
Maybe we should say "never use git revert for merged patches", however
since merged patches are not marked as such that does not really help
either.