[MPlayer-dev-eng] [PATCH] proper version info for git.mplayerhq.hu

Clément Bœsch ubitux at gmail.com
Sat Dec 4 11:41:09 CET 2010


On Sat, Dec 04, 2010 at 10:41:55AM +0100, Rudolf Polzer wrote:
> On Tue, Jul 27, 2010 at 04:54:35PM +1000, Rowan James wrote:
> > 
> > On 27/07/2010, at 2:58 PM, Rudolf Polzer wrote:
> > 
> > > On Mon, Jul 26, 2010 at 10:45:55PM +1000, Rowan James wrote:
> > >> 
> > >> 
> > >> Where there is an ID for a commit in 'master' included, do you mean 'origin/master'?
> > > 
> > > Yes, see patch.
> > > 
> > >> Even this doesn't sit well with users cloning from each other (interesting mental image...); as origin/master will point to whatever remote branch they started with.  The effect of that should be limited though, the ID will just not be any commit in the official repo...
> > > 
> > > But as long as the official repo is git-svn based, it will be an obvious difference.
> > 
> > Yep, as long as that holds; and even if it doesn't, IDs are effectively globally unique anyway.
> > 
> > Looks good to me =)
> 
> As I got no further reply to this, and would really like to see this applied, I
> attached the current version of this again and ask: is anything important
> missing? Can this get applied?
> 
> It:
> - clearly changes nothing for svn users
> - if a user of our official git repo has an unmodified repo, he will see the
>   same version number as if he has used svn

And "LOCAL".

> - if he has changes to svn, he gets SVN-r12345+3eb79c1 to also contain his git
>   hash
> - if the SVN revision cannot be identified (e.g. because he pulled from another
>   repo, e.g. uau's in case uau merges this change), you just git git-3eb79c1
>   (possibly appended with +1f9a317 for local changes)
> 
> I get, for example:
> MPlayer SVN-r32671+12b7526-4.5.1 (C) 2000-2010 MPlayer Team
> 
> Best regards,
> 

Btw, since your working on "helpers", having a .gitignore and an update
script in TOOLS with sth like "(cd ffmpeg; git pull); (cd
ffmpeg/libswscale; git pull); (cd libdvdnav/; svn up); (cd libdvdread4/;
svn up)" could be nice... And maybe an init script too :-)

But well, that's not what your patch is about.

Regarding the patch, what happen if git is not installed on the user
system?

-- 
Clément B.
Not sent from a jesusPhone.


More information about the MPlayer-dev-eng mailing list