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

Re: git-cvsimport "you may need to merge manually"

From
Randal L. Schwartz <merlyn@stonehenge.com>
Date
Mar 17, 2006, 03:41 UTC
Message-ID
<86fylh20x6.fsf@blue.stonehenge.com>
In-Reply-To
<7vk6at7o06.fsf@assigned-by-dhcp.cox.net>
>>>>> "Junio" == Junio C Hamano <junkio@cox.net> writes:

Junio> Since I know I was just trying things out, I do not care what is Junio> in my index nor in the working tree files, so I could at this Junio> point say:

Junio> 	$ git reset --hard

Junio> to sync the master tree, but in general you may be running Junio> cvsimport into a dirty tree, in which case you are screwed.

Yeah, this doesn't make sense. It used to "Just Work". I can certainly add "git reset --hard" to my workflow, if that's the real work around. And if so, the manpage should document that.

Junio> ... Ugh, and after I wrote all of the above, the version of git Junio> I have at work predates that commit X-<. So maybe this was Junio> fixed with that commit, and you are expected to say:

Junio> 	$ git pull . origin

Junio> assuming that you are on "master" branch and cvsimoprt tracks Junio> CVS head with "origin" branch, that is.

Again, if that's the case, the manpage should say what's really happening, so as not to confuse dumb people like me. :)

-- 
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: Junio C Hamano
Message 6 of 13 in “git-cvsimport "you may need to merge manually"”
  1. Randal L. SchwartzMar 17, 2006
  2. Junio C HamanoMar 17, 2006
  3. Randal L. SchwartzMar 17, 2006
  4. Randal L. SchwartzMar 17, 2006
  5. Junio C HamanoMar 17, 2006
  6. Randal L. SchwartzMar 17, 2006
  7. Junio C HamanoMar 17, 2006
  8. Randal L. SchwartzMar 17, 2006
  9. Junio C HamanoMar 18, 2006
  10. smurf@smurf.noris.deMar 17, 2006
  11. Junio C HamanoMar 17, 2006
  12. smurf@smurf.noris.deMar 17, 2006
  13. Junio C HamanoMar 17, 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.