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:04 UTC
Message-ID
<86k6at22mi.fsf@blue.stonehenge.com>
In-Reply-To
<86r75122yj.fsf@blue.stonehenge.com>
>>>>> "Randal" == Randal L Schwartz <merlyn@stonehenge.com> writes:

Randal> To bring the tree clean, I issued "git commit -a -m 'cvs sync'", and Randal> "git-whatchanged -p" shows the most recent commit with the diff actually Randal> *backed out* the most recent change in CVS, and the next change down was Randal> actually the good one. Weird. Do I need to start all over again?

Junio> Also, which branch are you on when you run git-cvsimport, and Junio> which branch did the commit 985ca7 go? I suspect it is storing Junio> the tip commit 985ca7 to a branch that you are _not_ on Junio> currently, but refraining from merging that to your current Junio> branch, or something like that.

Randal> Nope.  I'm on "master", and it should be writing "master".

And now for grins, I did "git-reset --hard 'HEAD^^^^^^^'", verified that the data was in a sensible state from a few weeks back, then did the git-cvsimport, and it replayed the CVS changes to bring it current. git-status showed that seven files were dirty, and "git-reset --hard" cleared that, and the files were in the right state.

Huh?
-- 
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: Randal L. SchwartzNext: Junio C Hamano
Message 4 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.