From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Jul 2007 03:07:32 GMT
Subject: Re: problem after cvsimport
Message-ID: <7vlkd3c16z.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <46A7FD99.9000305@tplogic.com>

Bert Douglas <bertd@tplogic.com> writes:

> I am new to git, so probably doing something wrong.
> Hope somebody can enlighten me.
> Here is what happened so far.
>
> Followed instructions here:
> http://www.kernel.org/pub/software/scm/git/docs/cvs-migration.html
>
> Did command like this:
>
> $ git cvsimport -C <destination> <module>
>
> This was done from top level of existing cvs working directory.
> Destination was new empty directory, outside the cvs tree.
>
> It worked for several hours and seemed to complete ok.
> I can look at history in destination git directory with gitk and git log.
> All the stuff in ".git" looks normal, as far as I can tell.
>
> But I have no files in the working directory.
> When I do command:
> $git checkout master
>
> I get a bunch of lines to console with "D" in front.
> Btw, what does that mean?  Nothing about it in "man git-checkout" or elsewhere that I can find.
> Then it says -- Already on branch "master"
>
> But working directory is still empty.

Have you tried "git checkout -f" after that?  With recent enough
git, "git cvsimport -C <destination> <module>" from the top
level of existing cvs working directory, with nonexistent
destination directory (that is, you let "git cvsimport -C" to
create that destination directory) would run "git checkout -f"
for you.