[debbugs-tracker] bug#10923: closed (git-version-gen reports wrong version after merge)

[GNU bug Tracking System]

Your message dated Fri, 06 Jul 2012 16:59:03 +0200
with message-id <address@hidden>
and subject line Re: bug#10923: git-version-gen reports wrong version after 
merge
has caused the debbugs.gnu.org bug report #10923,
regarding git-version-gen reports wrong version after merge
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
10923: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10923
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> git-version-gen reports wrong version after merge
>
>
>
>
> Date: 
>
> Thu, 01 Mar 2012 20:22:50 -0500
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/24.0.93 (gnu/linux)
>
>
>
>
> After merging a branch, version.test is failing, apparently because
> "git-version-gen" is generating an incorrect version number:
>
> #+begin_example
> olor:~/src/guile(master)% ./build-aux/git-version-gen .tarball-version
> 2.0.5.351-1c3ec
> olor:~/src/guile(master)% grep = GUILE-VERSION | head -3
> GUILE_MAJOR_VERSION=2
> GUILE_MINOR_VERSION=1
> GUILE_MICRO_VERSION=0
> olor:~/src/guile(master)% git describe
> v2.0.5-351-g1c3ecea
> olor:~/src/guile(master)% git describe --match v2.1\*
> v2.1.0-532-g1c3ecea
> #+end_example
>
> I assume that the v2.0.5 tag is simply closer in the commit graph than
> v2.1.0 (if git is looking at both parents of the merge commit). I'm not
> sure what the correct solution is, but this page describes some possible
> workarounds:
> <http://www.xerxesb.com/2010/git-describe-and-the-tale-of-the-wrong-commits/>
>
> -- 
> Inteligenta persono lernas la lingvon Esperanton rapide kaj facile.
> Esperanto estas moderna, kultura lingvo por la mondo. Simpla, fleksebla,
> belsona, Esperanto estas la praktika solvo de la problemo de universala
> interkompreno. Lernu la interlingvon Esperanton!
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#10923: git-version-gen reports wrong version after merge
>
>
>
>
> Date: 
>
> Fri, 06 Jul 2012 16:59:03 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux)
>
>
>
>
> On Fri 02 Mar 2012 02:22, BT Templeton <address@hidden> writes:
>
> > After merging a branch, version.test is failing, apparently because
> > "git-version-gen" is generating an incorrect version number:
>
> I believe I have fixed this on stable-2.0 and master.  Please let me
> know if it does not work for you.
>
> Cheers,
>
> Andy
> -- 
> http://wingolog.org/
>
>
> --- End Message ---