From: Martin Langhoff <martin.langhoff@gmail.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Wolfgang Denk <wd@denx.de>, GIT <git@vger.kernel.org>
Subject: Re: Switching heads and head vs branch after CVS import
Date: Tue, 16 Aug 2005 08:09:02 +1200 [thread overview]
Message-ID: <46a038f90508151309269ffc04@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0508150930020.3553@g5.osdl.org>
On 8/16/05, Linus Torvalds <torvalds@osdl.org> wrote:
> The good news is that if you guess wrong, and you claim a merge where none
> exists, it doesn't really do any real damage.
I had figured out what part of the code I wanted to hack, but was
concerned that marking things that were merges in cvs-speak but not in
git-speak would leave me with broken import and problems going
forward.
If I find the time, I'll add some sort of pattern-match parameters to
be tried against the commitmsg to extract likely head/branch names
where we are merging from. My problem right now is that the only cvs
repo with interesting branches and merges I have is huge, and takes an
hour to import. That puts a damper on things, unfortunately.
cheers,
martin
next prev parent reply other threads:[~2005-08-15 20:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-15 0:24 Switching heads and head vs branch after CVS import Martin Langhoff
2005-08-15 0:40 ` Junio C Hamano
2005-08-15 0:46 ` Linus Torvalds
2005-08-15 2:05 ` Martin Langhoff
2005-08-15 2:49 ` Linus Torvalds
2005-08-15 8:22 ` Sven Verdoolaege
2005-08-15 9:07 ` Matthias Urlichs
2005-08-15 9:48 ` Martin Langhoff
2005-08-15 8:09 ` Wolfgang Denk
2005-08-15 10:38 ` Matthias Urlichs
2005-08-15 11:45 ` Sven Verdoolaege
2005-08-15 16:42 ` Linus Torvalds
2005-08-15 20:09 ` Martin Langhoff [this message]
2005-08-15 20:22 ` Wolfgang Denk
2005-08-15 22:37 ` Linus Torvalds
2005-08-15 22:53 ` Johannes Schindelin
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=46a038f90508151309269ffc04@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
--cc=wd@denx.de \
/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).