From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: BT Templeton Newsgroups: gmane.lisp.guile.bugs Subject: bug#10923: git-version-gen reports wrong version after merge Date: Thu, 01 Mar 2012 20:22:50 -0500 Message-ID: <87r4xb94ph.fsf@olor.terpri.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1330651455 15589 80.91.229.3 (2 Mar 2012 01:24:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 2 Mar 2012 01:24:15 +0000 (UTC) To: 10923@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Fri Mar 02 02:24:15 2012 Return-path: Envelope-to: guile-bugs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1S3HEC-0001LQ-FS for guile-bugs@m.gmane.org; Fri, 02 Mar 2012 02:24:12 +0100 Original-Received: from localhost ([::1]:54393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3HEB-0006H5-Qx for guile-bugs@m.gmane.org; Thu, 01 Mar 2012 20:24:11 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:54067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3HE8-0006H0-4L for bug-guile@gnu.org; Thu, 01 Mar 2012 20:24:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S3HE5-0004vC-LP for bug-guile@gnu.org; Thu, 01 Mar 2012 20:24:07 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3HE5-0004v0-I5 for bug-guile@gnu.org; Thu, 01 Mar 2012 20:24:05 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1S3HE2-0001sk-Ch for bug-guile@gnu.org; Thu, 01 Mar 2012 20:24:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: BT Templeton Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-guile@gnu.org Resent-Date: Fri, 02 Mar 2012 01:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 10923 X-GNU-PR-Package: guile X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-guile@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.13306514317215 (code B ref -1); Fri, 02 Mar 2012 01:24:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Mar 2012 01:23:51 +0000 Original-Received: from localhost ([127.0.0.1]:58083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S3HDr-0001sA-7o for submit@debbugs.gnu.org; Thu, 01 Mar 2012 20:23:51 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:54116) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S3HDf-0001rl-8v for submit@debbugs.gnu.org; Thu, 01 Mar 2012 20:23:40 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S3HDB-0004n4-UF for submit@debbugs.gnu.org; Thu, 01 Mar 2012 20:23:11 -0500 Original-Received: from lists.gnu.org ([208.118.235.17]:49844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3HDB-0004mz-R3 for submit@debbugs.gnu.org; Thu, 01 Mar 2012 20:23:09 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:47123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3HD9-0006DH-PR for bug-guile@gnu.org; Thu, 01 Mar 2012 20:23:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S3HD7-0004mR-Ir for bug-guile@gnu.org; Thu, 01 Mar 2012 20:23:07 -0500 Original-Received: from deleuze.hcoop.net ([69.90.123.67]:38918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3HD7-0004lb-Fi for bug-guile@gnu.org; Thu, 01 Mar 2012 20:23:05 -0500 Original-Received: from cpe-071-070-253-241.nc.res.rr.com ([71.70.253.241] helo=olor.terpri.org) by deleuze.hcoop.net with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.63) (envelope-from ) id 1S3HD0-0002N6-EI for bug-guile@gnu.org; Thu, 01 Mar 2012 20:22:58 -0500 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.93 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 1) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Original-Sender: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.bugs:6240 Archived-At: 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: -- 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!