From: "H. Peter Anvin" <hpa@zytor.com>
To: "Stephen C. Tweedie" <sct@redhat.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Suggestion: superceded tags
Date: Fri, 27 May 2005 09:10:10 -0700 [thread overview]
Message-ID: <42974662.3040106@zytor.com> (raw)
In-Reply-To: <1117193179.1957.28.camel@sisko.sctweedie.blueyonder.co.uk>
Stephen C. Tweedie wrote:
> Hi,
>
> On Fri, 2005-05-27 at 06:29, H. Peter Anvin wrote:
>
>
>>When a tag is moved, a new tag object is created. This tag object will
>>have a "supercedes" header which references the old tag object.
>
> Strictly speaking, don't you need to allow multiple "supercedes" lines
> to cover all the cases? The pathological case is when you've got
> multiple trees all with different variants of the same tag name, and you
> try to merge them all at once with a multi-parent commit.
>
> Sure, tags refer to trees, not commits, so you don't necessarily have to
> do this tag resolution at commit time (indeed, since commits don't refer
> to tags, you *can't* do that resolution atomically on commit.)
>
> But if you do pull tags into the local .git/refs/tags on merge, then you
> will want to either resolve the conflict or supercede those tags, and at
> that point you've got multiple equally valid tags in the histories that
> are being superceded. Doing so is a porcelain issue, but the core will
> still need to understand tags with multiple supercedes: lines.
>
Indeed, multiple supercedes lines are useful to conver the resolution of
a tag conflict.
-hpa
prev parent reply other threads:[~2005-05-27 16:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-27 5:29 Suggestion: superceded tags H. Peter Anvin
2005-05-27 11:26 ` Stephen C. Tweedie
2005-05-27 16:10 ` H. Peter Anvin [this message]
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=42974662.3040106@zytor.com \
--to=hpa@zytor.com \
--cc=git@vger.kernel.org \
--cc=sct@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.