[FFmpeg-devel] [PATCH] Use git describe in version.sh

[Michael Niedermayer]

On Thu, Dec 30, 2010 at 12:30:29AM +0000, Ramiro Polla wrote:
> On Mon, Dec 27, 2010 at 7:37 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
> > On Mon, Dec 27, 2010 at 07:34:43PM +0100, Reinhard Tartler wrote:
> >> For releases, how about something like "0.7-12-githash", where "0.7"
> >> stands for branchpoint for the 0.7 release, and "12" indicates twelve
> >> additional commits from there. To avoid confusion, we name the first
> >> 'real' release then "0.7.0", such that real releases always end up with
> >> three parts in the version number.
> >
> > I dont care at all how relese branches are named but i do NOT want release
> > nonsense to leak into the main development revissions
> > devel HEAD is not a continuation of the last release. The last release is a
> > possibly modified branch of devel HEAD.
> > Releases can be done of revissions long after they are pushed to the public,
> 
> IMO tagging after branching and having "0.7-12-githash" would be good.

IMO having tags in trunk where branches where made, makes sense, but refering
to main devel as a <last release>-whatever num is silly
Our development model is not even remotely matching this
we dont focus primarely on releases and then after each release focus on
the next.

We focus primarely on trunk with releases being hated and branched of outdated
and largely unmaintained (except one lone devel)
and that are officially strongly recommanded not to be used.



> 
> >> For developer branches, an identification like "mt-0.7-377-githash"
> >> could then indicate 377 commits after the 0.7 branchpoint from the "mt"
> >> branch.
> >>
> >> >> That leaves 3 options:
> >> >>
> >> >> 1) Tag the root commit and have something like svn rev numbers
> 
> This leads to different revision numbers from the SVN repo because of
> branches in SVN and interleaving libswscale history.

Iam sure its technically possible to have revissions as
r17263-githash
and
swscale-r128763-githash

to keep them matching, not saying that would be easy or i would suggest that to
be done.

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Concerning the gods, I have no means of knowing whether they exist or not
or of what sort they may be, because of the obscurity of the subject, and
the brevity of human life -- Protagoras
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20101231/a845c832/attachment.pgp>