git cvsimport fails

git cvsimport fails

[Thomas Hühn]

Hi

I'm trying to import from a CVS repository and get this error message at
the end:

|Commit ID 076fd7d71925bb551320aa20aa8eec68bf218f45
|DONE.
|fatal: Needed a single revision
|Can merge only exactly one commit into empty head
|Could not merge origin into the current branch.

Is my git repo broken, is the CVS repo broken, is it just a shortcoming
of cvsimport? Any idea whether it is fixable?

Thomas

Re: git cvsimport fails

[Thomas Hühn]

Thomas Hühn <newsgroups@thomas-huehn.de> writes:

> I'm trying to import from a CVS repository and get this error message at
> the end:
>
> |Commit ID 076fd7d71925bb551320aa20aa8eec68bf218f45
> |DONE.
> |fatal: Needed a single revision
> |Can merge only exactly one commit into empty head
> |Could not merge origin into the current branch.
>
> Is my git repo broken, is the CVS repo broken, is it just a shortcoming
> of cvsimport? Any idea whether it is fixable?

Okay, should have looked further for suitable git commands. git-fsck
tells me that HEAD is not a symbolic ref.

HEAD contains "ref: refs/heads/master", but refs/heads contains no
"master", just other files.

Can I find out, which hash master should point at?

Thomas

Re: git cvsimport fails

[Florian Weimer]

* Thomas Hühn:

> HEAD contains "ref: refs/heads/master", but refs/heads contains no
> "master", just other files.
>
> Can I find out, which hash master should point at?

After the initial checkout, it should point to "origin"; this is the
HEAD of the CVS repository.  Of course, if your main development line
resides on another branch, you should use that.

Re: git cvsimport fails

[Thomas Hühn]

Florian Weimer <fw@deneb.enyo.de> writes:

> * Thomas Hühn:
>
>> HEAD contains "ref: refs/heads/master", but refs/heads contains no
>> "master", just other files.
>>
>> Can I find out, which hash master should point at?
>
> After the initial checkout, it should point to "origin"; this is the
> HEAD of the CVS repository.  Of course, if your main development line
> resides on another branch, you should use that.

Okay, thanks. I'll enter that.

Thomas