From: Randal L. Schwartz Date: Fri, 17 Mar 2006 03:04:21 GMT Subject: Re: git-cvsimport "you may need to merge manually" Message-ID: <86k6at22mi.fsf@blue.stonehenge.com> In-Reply-To: <86r75122yj.fsf@blue.stonehenge.com> >>>>> "Randal" == Randal L Schwartz 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 Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!