From: Martin Jambor <mjambor@suse.cz>
To: "Martin Liška" <mliska@suse.cz>,
"Joseph Myers" <joseph@codesourcery.com>,
gcc@gcc.gnu.org
Cc: esr@thyrsus.com
Subject: Re: GIT conversion: question about tags & release branches
Date: Thu, 09 Jan 2020 11:46:00 -0000 [thread overview]
Message-ID: <ri6pnfsc0pk.fsf@suse.cz> (raw)
In-Reply-To: <f0d761a0-6b10-1e19-3ce4-145c4da5b619@suse.cz>
Hi,
On Thu, Jan 09 2020, Martin Liška wrote:
> Hi.
>
> I have question about release branches and release tags. For the current
> git mirror, we do have release tags living on release branches. Example:
>
> commit 64e1a4df1bc9dbf4cedb3a842c4eaff6b3425a66
> Author: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
> Date: Mon Aug 12 08:40:24 2019 +0000
>
> * BASE-VER: Set to 9.2.1.
>
>
> git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@274276 138bc75d-0d04-0410-961f-82ee72b054a4
>
> commit 3e7b85061947bdc7c7465743ba90734566860821 (tag: gcc-9_2_0-release) <- THE TAG
> Author: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
> Date: Mon Aug 12 07:38:49 2019 +0000
>
> Update ChangeLog and version files for release
>
> git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@274274 138bc75d-0d04-0410-961f-82ee72b054a4
>
> commit fc3f35e10b6ca627727d71c74fd5e76785226200
> Author: gccadmin <gccadmin@138bc75d-0d04-0410-961f-82ee72b054a4>
> Date: Mon Aug 12 00:16:21 2019 +0000
>
> Daily bump.
>
> git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@274271 138bc75d-0d04-0410-961f-82ee72b054a4
>
> while the reposurgeon git has:
>
> commit a9044428b313402507aa047a17e6ea10f63b2b8b
> Author: Jakub Jelinek <jakub@redhat.com>
> Date: Mon Aug 12 10:40:24 2019 +0200
>
> * BASE-VER: Set to 9.2.1.
>
> From-SVN: r274276
>
> commit d46878c3cce3be8f6c8878be8af326adecbb8ec6 <- THE TAG IS MISSING HERE
> Author: Jakub Jelinek <jakub@gcc.gnu.org>
> Date: Mon Aug 12 09:38:49 2019 +0200
>
> Update ChangeLog and version files for release
>
> From-SVN: r274274
>
I use the release tags every now and then so this caught my attention
but I do not understand what the problem is?
In the gcc-reposurgeon-7a conversion, there is a tag called
gcc_9_2_0_release:
mjambor@virgil:/space/mjambor/gcc/newconv/gcc-reposurgeon-7a.git$ git log -1 gcc_9_2_0_release
commit 56bc3061f168c39a85117d4daefc2d5c0e4edb91 (tag: gcc_9_2_0_release)
Author: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Mon Aug 12 09:38:59 2019 +0200
Tagging source as tags/gcc_9_2_0_release
From-SVN: r274275
Even when I query the commit directly, it shows it is tagged:
mjambor@virgil:/space/mjambor/gcc/newconv/gcc-reposurgeon-7a.git$ git log -1 56bc3061f168c39a85117d4daefc2d5c0e4edb91
commit 56bc3061f168c39a85117d4daefc2d5c0e4edb91 (tag: gcc_9_2_0_release)
Author: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Mon Aug 12 09:38:59 2019 +0200
Tagging source as tags/gcc_9_2_0_release
From-SVN: r274275
in gcc-reposurgeon-7b it is called releases/gcc-9.2.0
commit 56bc3061f168c39a85117d4daefc2d5c0e4edb91 (tag: releases/gcc-9.2.0)
Author: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Mon Aug 12 09:38:59 2019 +0200
Tagging source as tags/gcc_9_2_0_release
From-SVN: r274275
It seems that reposurgeon conversion has a commit representing the
revision r274275 whereas git mirror does not, but that does not seem to
be too bad?
> That's when I do git log parent/gcc-9-branch (git log origin/releases/gcc-9 respectively).
> And git log releases/gcc-9.2.0:
>
> commit 56bc3061f168c39a85117d4daefc2d5c0e4edb91 (tag: releases/gcc-9.2.0) <- THE TAG
> Author: Jakub Jelinek <jakub@gcc.gnu.org>
> Date: Mon Aug 12 09:38:59 2019 +0200
>
> Tagging source as tags/gcc_9_2_0_release
>
> From-SVN: r274275
>
> commit d46878c3cce3be8f6c8878be8af326adecbb8ec6
> Author: Jakub Jelinek <jakub@gcc.gnu.org>
> Date: Mon Aug 12 09:38:49 2019 +0200
>
> Update ChangeLog and version files for release
>
> From-SVN: r274274
>
> I see it useful to have the release tags on release branches.
> Thoughts?
Thinking about it, assuming the reposurgeon is the way to go, did we
decide whether it's going to be the a or b variant? I like the tags in
the B version better, but it does not seem to have all the branches, I
mean:
mjambor@virgil:/space/mjambor/gcc/newconv/gcc-reposurgeon-7a.git$ git branch | wc -l
536
mjambor@virgil:/space/mjambor/gcc/newconv/gcc-reposurgeon-7b.git$ git branch | wc -l
38
I did clone both with --mirror.
Thanks,
Martin
next prev parent reply other threads:[~2020-01-09 11:46 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 21:32 Test GCC conversion with reposurgeon available Joseph Myers
2019-12-17 23:33 ` Bernd Schmidt
2019-12-18 0:51 ` Eric S. Raymond
2019-12-18 0:52 ` Joseph Myers
2019-12-18 3:28 ` Joseph Myers
2019-12-18 14:36 ` Joseph Myers
2019-12-18 13:10 ` Jason Merrill
2019-12-18 18:16 ` Joseph Myers
2019-12-19 5:50 ` Jason Merrill
2019-12-19 15:55 ` Joseph Myers
2019-12-18 21:55 ` Joseph Myers
2019-12-19 0:36 ` Bernd Schmidt
2019-12-19 0:58 ` Joseph Myers
2019-12-19 13:51 ` Test GCC conversions (publicly) available Mark Wielaard
2019-12-19 14:06 ` Eric S. Raymond
2019-12-19 14:40 ` Joseph Myers
2019-12-19 16:00 ` Eric S. Raymond
2019-12-19 16:03 ` Richard Earnshaw (lists)
2019-12-19 16:08 ` Eric S. Raymond
2019-12-19 16:29 ` Test GCC conversion with reposurgeon available Joseph Myers
2019-12-22 13:57 ` Joseph Myers
2019-12-23 17:27 ` Roman Zhuykov
2019-12-24 11:50 ` Joseph Myers
2019-12-24 15:55 ` Segher Boessenkool
2019-12-24 17:17 ` Joseph Myers
2019-12-24 18:14 ` Segher Boessenkool
2019-12-25 11:03 ` Roman Zhuykov
2019-12-25 11:20 ` Joseph Myers
2019-12-25 12:23 ` Eric S. Raymond
2019-12-25 14:32 ` Andreas Schwab
2019-12-25 14:41 ` Joseph Myers
2019-12-25 15:10 ` Andreas Schwab
2019-12-25 15:36 ` Joseph Myers
2019-12-25 17:15 ` Segher Boessenkool
2019-12-25 19:33 ` Eric S. Raymond
2019-12-26 21:03 ` Vincent Lefevre
2019-12-26 21:31 ` Eric S. Raymond
2019-12-26 22:25 ` Toon Moene
2019-12-26 22:32 ` Eric S. Raymond
2019-12-27 14:40 ` Segher Boessenkool
2019-12-26 22:57 ` Vincent Lefevre
2019-12-26 23:38 ` Eric S. Raymond
2019-12-25 19:40 ` Eric S. Raymond
2019-12-27 21:29 ` Andreas Schwab
2019-12-27 21:43 ` Joseph Myers
2019-12-25 19:19 ` Eric S. Raymond
2019-12-27 21:30 ` Andreas Schwab
2019-12-28 2:43 ` Eric S. Raymond
2019-12-27 14:37 ` Richard Earnshaw
2019-12-24 10:57 ` Maxim Kuvyrkov
2019-12-28 16:30 ` Joseph Myers
2020-01-03 12:38 ` Joseph Myers
2020-01-06 23:58 ` Andrew Pinski
2020-01-07 0:30 ` Joseph Myers
2020-01-07 0:44 ` Richard Earnshaw
2020-01-09 12:22 ` Joseph Myers
2020-01-09 21:57 ` Joseph Myers
2020-01-09 9:44 ` GIT conversion: question about tags & release branches Martin Liška
2020-01-09 10:51 ` Richard Earnshaw (lists)
2020-01-09 11:06 ` Martin Liška
2020-01-09 11:31 ` Eric S. Raymond
2020-01-09 11:46 ` Martin Jambor [this message]
2020-01-09 11:50 ` Martin Liška
2020-01-09 12:37 ` Joseph Myers
2020-01-09 13:38 ` Martin Liška
2020-01-09 11:57 ` Richard Earnshaw (lists)
2020-01-09 11:59 ` Richard Earnshaw (lists)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ri6pnfsc0pk.fsf@suse.cz \
--to=mjambor@suse.cz \
--cc=esr@thyrsus.com \
--cc=gcc@gcc.gnu.org \
--cc=joseph@codesourcery.com \
--cc=mliska@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).