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

Re: What's in git.git

From
Randal L. Schwartz <merlyn@stonehenge.com>
Date
Mar 22, 2006, 02:18 UTC
Message-ID
<86y7z3mdcz.fsf@blue.stonehenge.com>
In-Reply-To
<7vodzzb5q3.fsf@assigned-by-dhcp.cox.net>
>>>>> "Junio" == Junio C Hamano <junkio@cox.net> writes:
Junio>  - cvsimport post-import checkout fix.

Junio> Earlier we had a workaround to deal with people who import Junio> into the current branch by not checking out. After Junio> incrementally importing from the same CVS repository again, Junio> however, the code did update the branch head. This made the Junio> working tree and the index stale and was causing more Junio> confusion than it avoided.

Junio> This fix is to make re-importing act more like git-pull, not Junio> git-fetch. So if you run an incremental import into the Junio> current branch, it tries to fast-forward the working tree and Junio> index (your current branch head, index and working tree had Junio> better be pristine with respect to the CVS repository for Junio> this, but that is already an requirement for a tracking Junio> branch anyway) when your current branch is the tracking Junio> branch, or merge the imported result into your current branch Junio> if you are using a separate tracking branch.

Junio> I've done some testing on this myself, but am waiting for Junio> independent confirmations from cvsimport users. Merlyn?

I'm waiting for that CVS tree to change again. It changes every 4-5 days.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
Previous: Junio C HamanoNext: Randal L. Schwartz
Message 2 of 10 in “What's in git.git”
  1. Junio C HamanoMar 22, 2006
  2. Randal L. SchwartzMar 22, 2006
  3. Randal L. SchwartzMar 22, 2006
  4. Junio C HamanoMar 22, 2006
  5. Randal L. SchwartzMar 22, 2006
  6. Junio C HamanoMar 22, 2006
  7. Linus TorvaldsMar 22, 2006
  8. Bertrand JacquinMar 22, 2006
  9. Petr BaudisMar 22, 2006
  10. Junio C HamanoMar 22, 2006

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.