git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Switching heads and head vs branch after CVS import

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Aug 15, 2005, 20:09 UTC
Message-ID
<46a038f90508151309269ffc04@mail.gmail.com>
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
Previous: Linus TorvaldsNext: Wolfgang Denk
Message 13 of 16 in “Switching heads and head vs branch after CVS import”
  1. Martin LanghoffAug 15, 2005
  2. Junio C HamanoAug 15, 2005
  3. Linus TorvaldsAug 15, 2005
  4. Martin LanghoffAug 15, 2005
  5. Linus TorvaldsAug 15, 2005
  6. Sven VerdoolaegeAug 15, 2005
  7. Matthias UrlichsAug 15, 2005
  8. Martin LanghoffAug 15, 2005
  9. Wolfgang DenkAug 15, 2005
  10. Matthias UrlichsAug 15, 2005
  11. Sven VerdoolaegeAug 15, 2005
  12. Linus TorvaldsAug 15, 2005
  13. Martin LanghoffAug 15, 2005
  14. Wolfgang DenkAug 15, 2005
  15. Linus TorvaldsAug 15, 2005
  16. Johannes SchindelinAug 15, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.