From unknown Tue Jun 24 22:38:57 2025 X-Loop: help-debbugs@gnu.org Subject: bug#10923: git-version-gen reports wrong version after merge 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: To: 10923@debbugs.gnu.org X-Debbugs-Original-To: bug-guile@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.13306514317215 (code B ref -1); Fri, 02 Mar 2012 01:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Mar 2012 01:23:51 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 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 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 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 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 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 From: BT Templeton Date: Thu, 01 Mar 2012 20:22:50 -0500 Message-ID: <87r4xb94ph.fsf@olor.terpri.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.93 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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-Received-From: 208.118.235.17 X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.1 (-) 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! From unknown Tue Jun 24 22:38:57 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: BT Templeton Subject: bug#10923: closed (Re: bug#10923: git-version-gen reports wrong version after merge) Message-ID: References: <87obntx7ew.fsf@pobox.com> <87r4xb94ph.fsf@olor.terpri.org> X-Gnu-PR-Message: they-closed 10923 X-Gnu-PR-Package: guile Reply-To: 10923@debbugs.gnu.org Date: Fri, 06 Jul 2012 15:05:04 +0000 Content-Type: multipart/mixed; boundary="----------=_1341587104-28271-1" This is a multi-part message in MIME format... ------------=_1341587104-28271-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #10923: git-version-gen reports wrong version after merge which was filed against the guile package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 10923@debbugs.gnu.org. --=20 10923: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D10923 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1341587104-28271-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 10923-done) by debbugs.gnu.org; 6 Jul 2012 15:04:16 +0000 Received: from localhost ([127.0.0.1]:52892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SnA4t-0007KE-Gy for submit@debbugs.gnu.org; Fri, 06 Jul 2012 11:04:16 -0400 Received: from a-pb-sasl-sd.pobox.com ([74.115.168.62]:39989 helo=sasl.smtp.pobox.com) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SnA4p-0007Jq-GF for 10923-done@debbugs.gnu.org; Fri, 06 Jul 2012 11:04:12 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by b-pb-sasl-sd.pobox.com (Postfix) with ESMTP id 633D3BE56; Fri, 6 Jul 2012 10:59:07 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=w1SvUQjlPBYl0aUhSMK2mzSUUzc=; b=r0XlIf 2ro5C9rauguEOVU2UIdcltr3B40chrnK5b3xyyyK3JIX1DMLZX/kKPMaiWpmD4T+ 6wjlB4Ifq1vB1Gzrcb3isZPZC2AckwoqrolXaGHuV2VFITjPpdUGCk05OOBUi3uC ef2l4J5HKeVkE7sGvdS8MHu+CQMuU5GznV06c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=TFbyLfHPpzQIr/Fx0nRR+SBUjng8P5Ja CKt0gurtNg054TorWLCgHRbpZ2SjgaxI95dhkTE2RC9XVNEG9H2fOxznTYBPEq9Y 4qZBTQ7fQzY56wV2ncaQmAqYxUCDeAgOrmY4EyfyjC8td73NkePDYvXFDBUMjTBG 4NKNeOrxwsc= Received: from b-pb-sasl-sd. (unknown [127.0.0.1]) by b-pb-sasl-sd.pobox.com (Postfix) with ESMTP id 5CC18BE55; Fri, 6 Jul 2012 10:59:07 -0400 (EDT) Received: from badger (unknown [89.131.176.233]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by b-pb-sasl-sd.pobox.com (Postfix) with ESMTPSA id 91002BE54; Fri, 6 Jul 2012 10:59:06 -0400 (EDT) From: Andy Wingo To: BT Templeton Subject: Re: bug#10923: git-version-gen reports wrong version after merge References: <87r4xb94ph.fsf@olor.terpri.org> Date: Fri, 06 Jul 2012 16:59:03 +0200 In-Reply-To: <87r4xb94ph.fsf@olor.terpri.org> (BT Templeton's message of "Thu, 01 Mar 2012 20:22:50 -0500") Message-ID: <87obntx7ew.fsf@pobox.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 22417DD0-C77B-11E1-93DD-FA6787E41631-02397024!b-pb-sasl-sd.pobox.com X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 10923-done Cc: 10923-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) On Fri 02 Mar 2012 02:22, BT Templeton 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/ ------------=_1341587104-28271-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Mar 2012 01:23:51 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 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 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 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 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 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 From: BT Templeton To: bug-guile@gnu.org Subject: git-version-gen reports wrong version after merge Date: Thu, 01 Mar 2012 20:22:50 -0500 Message-ID: <87r4xb94ph.fsf@olor.terpri.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.93 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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-Received-From: 208.118.235.17 X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.1 (-) 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! ------------=_1341587104-28271-1--