From mboxrd@z Thu Jan 1 00:00:00 1970 From: merlyn@stonehenge.com (Randal L. Schwartz) Subject: Re: git-cvsimport "you may need to merge manually" Date: 16 Mar 2006 19:04:21 -0800 Message-ID: <86k6at22mi.fsf@blue.stonehenge.com> References: <86veud23v0.fsf@blue.stonehenge.com> <7vu09x7puo.fsf@assigned-by-dhcp.cox.net> <86r75122yj.fsf@blue.stonehenge.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Mar 17 04:04:36 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FK5GM-00089x-1N for gcvg-git@gmane.org; Fri, 17 Mar 2006 04:04:26 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964919AbWCQDEX (ORCPT ); Thu, 16 Mar 2006 22:04:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964920AbWCQDEX (ORCPT ); Thu, 16 Mar 2006 22:04:23 -0500 Received: from blue.stonehenge.com ([209.223.236.162]:30068 "EHLO blue.stonehenge.com") by vger.kernel.org with ESMTP id S964919AbWCQDEW (ORCPT ); Thu, 16 Mar 2006 22:04:22 -0500 Received: from localhost (localhost [127.0.0.1]) by blue.stonehenge.com (Postfix) with ESMTP id 6933D8F6B6; Thu, 16 Mar 2006 19:04:22 -0800 (PST) Received: from blue.stonehenge.com ([127.0.0.1]) by localhost (blue.stonehenge.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 25316-02-21; Thu, 16 Mar 2006 19:04:21 -0800 (PST) Received: by blue.stonehenge.com (Postfix, from userid 1001) id EB1278F779; Thu, 16 Mar 2006 19:04:21 -0800 (PST) To: Junio C Hamano x-mayan-date: Long count = 12.19.13.2.8; tzolkin = 2 Lamat; haab = 6 Cumku In-Reply-To: <86r75122yj.fsf@blue.stonehenge.com> User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: >>>>> "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!