problem after cvsimport

problem after cvsimport

[Bert Douglas]

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.


Thanks much,
Bert Douglas

Re: problem after cvsimport

[Junio C Hamano]

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.

Re: problem after cvsimport

[Bert Douglas]

Junio C Hamano wrote:
> 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.
>   
Somehow I missed that option.
That worked.  Very fast.  Thanks.

Am I going to have to do "-f" a lot?
How will I know when to do it?
Why not do it all the time?

Re: problem after cvsimport

[Junio C Hamano]

Bert Douglas <bertd@tplogic.com> writes:

> Am I going to have to do "-f" a lot?
> How will I know when to do it?
> Why not do it all the time?

With recent enough git, you shouldn't even have to do that extra
"git checkout".  It was noticed and fixed quite a while ago.

Re: problem after cvsimport

[Bert Douglas]

Junio C Hamano wrote:
> Bert Douglas <bertd@tplogic.com> writes:
>
>   
>> Am I going to have to do "-f" a lot?
>> How will I know when to do it?
>> Why not do it all the time?
>>     
>
> With recent enough git, you shouldn't even have to do that extra
> "git checkout".  It was noticed and fixed quite a while ago.
>
>   
Thanks much.

$ git --version
git version 1.5.2.4

But I guess my basic question remains in two parts.
(1) Will it 'get out of sync' again sometime ?
(2) Will anything bad happen if I always do 'checkout -f' ?