* git cvsimport fails
@ 2007-05-01 15:47 Thomas Hühn
2007-05-01 15:54 ` Thomas Hühn
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Hühn @ 2007-05-01 15:47 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git cvsimport fails
2007-05-01 15:47 git cvsimport fails Thomas Hühn
@ 2007-05-01 15:54 ` Thomas Hühn
2007-05-06 6:41 ` Florian Weimer
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Hühn @ 2007-05-01 15:54 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git cvsimport fails
2007-05-01 15:54 ` Thomas Hühn
@ 2007-05-06 6:41 ` Florian Weimer
2007-05-06 7:04 ` Thomas Hühn
0 siblings, 1 reply; 4+ messages in thread
From: Florian Weimer @ 2007-05-06 6:41 UTC (permalink / raw)
To: git
* 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git cvsimport fails
2007-05-06 6:41 ` Florian Weimer
@ 2007-05-06 7:04 ` Thomas Hühn
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Hühn @ 2007-05-06 7:04 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-05-06 7:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-01 15:47 git cvsimport fails Thomas Hühn
2007-05-01 15:54 ` Thomas Hühn
2007-05-06 6:41 ` Florian Weimer
2007-05-06 7:04 ` Thomas Hühn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox