From: Randal L. Schwartz Date: Fri, 17 Mar 2006 02:57:08 GMT Subject: Re: git-cvsimport "you may need to merge manually" Message-ID: <86r75122yj.fsf@blue.stonehenge.com> In-Reply-To: <7vu09x7puo.fsf@assigned-by-dhcp.cox.net> >>>>> "Junio" == Junio C Hamano writes: >> Right... why didn't it commit those? I'm having to issue "fake" >> commits now, so I've lost the cvs-log comments that were formerly >> very complete and cool. Junio> I do not use cvsimport but I wonder what Commit ID 985ca7 Junio> contains. Can you try "git show 985ca7" and see if that is the Junio> commit you want? To bring the tree clean, I issued "git commit -a -m 'cvs sync'", and "git-whatchanged -p" shows the most recent commit with the diff actually *backed out* the most recent change in CVS, and the next change down was 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. Nope. I'm on "master", and it should be writing "master". -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!