From: picca <picca@synchrotron-soleil.Fr>
To: Git Mailing List <git@vger.kernel.org>
Subject: Problem with cvsimport
Date: Wed, 30 Jan 2008 11:53:08 +0100 [thread overview]
Message-ID: <20080130115308.760d6e20@synchrotron-soleil.Fr> (raw)
Hello
When I try to import a project into git with the cvsimport tool, it
works fine most of the time. I obtain a clean repository without all
thoses CVS directories.
But sometimes during the import the cvs server hang and i need to do
Ctrl+C the restart the command.
cvsimport skip the already downloaded patchset but at the end I obtain
this message
---
Generating pack...
Done counting 1534 objects.
Deltifying 1534 objects...
100% (1534/1534) done
Writing 1534 objects...
100% (1534/1534) done
Total 1534 (delta 1160), reused 0 (delta 0)
Pack pack-8fb4f1c25c831ba29c7bd53989cb1b445b60bc07 created.
Removing unused objects 100%...
Done.
DONE.
fatal: Needed a single revision
Can merge only exactly one commit into empty head
Could not merge origin into the current branch.
---
So to resume:
* In one shoot no problem at the end cvsimport checkout the
right head.
* multiple shoot impossible to merge origin into the current branch.
How this problem can be solved ?
Thanks
Frederic
next reply other threads:[~2008-01-30 10:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-30 10:53 picca [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-09-29 15:25 problem with cvsimport picca Frédéric
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080130115308.760d6e20@synchrotron-soleil.Fr \
--to=picca@synchrotron-soleil.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).