From: "H. Peter Anvin" <hpa@zytor.com>
To: martin.langhoff@gmail.com
Cc: Git Mailing List <git@vger.kernel.org>, Junio C Hamano <junkio@cox.net>
Subject: Re: [PATCH] git-cvsimport-script: handling of tags
Date: Tue, 06 Sep 2005 16:19:32 -0700 [thread overview]
Message-ID: <431E2404.6060804@zytor.com> (raw)
In-Reply-To: <46a038f9050906155962d33869@mail.gmail.com>
Martin Langhoff wrote:
>
>>My style has always be to use tags for merges; tag the origin branch as
>>well as before and after on the receiving branch.
>
> Do you move the tags with cvs tag -F? If that's the case, the data you
> need to merge is lost... otherwise, you could hack an alternative
> merge detection based on your tagnames.
>
No, there are three tags:
before-merge-foo
| after-merge-foo
| |
branch 1 ---*--*----
/
/
branch 2 ---*-------
|
merge-point-foo
That's why I was a bit confused. I thought most people did something
similar.
-hpa
next prev parent reply other threads:[~2005-09-06 23:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-06 17:36 [PATCH] git-cvsimport-script: handling of tags H. Peter Anvin
2005-09-06 18:56 ` H. Peter Anvin
2005-09-06 20:24 ` H. Peter Anvin
2005-09-06 21:21 ` Martin Langhoff
2005-09-06 21:33 ` H. Peter Anvin
2005-09-06 22:59 ` Martin Langhoff
2005-09-06 23:19 ` H. Peter Anvin [this message]
2005-09-06 19:01 ` Junio C Hamano
2005-09-07 2:44 ` Martin Langhoff
2005-09-07 2:48 ` H. Peter Anvin
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=431E2404.6060804@zytor.com \
--to=hpa@zytor.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=martin.langhoff@gmail.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 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 NNTP newsgroup(s).