[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

New import of CVS module gnokii-extras to git repository can cause prob

From: Daniele Forsi
Subject: New import of CVS module gnokii-extras to git repository can cause problems
Date: Fri, 25 Sep 2009 11:14:02 +0200

It seems that when I converted the CVS repository to multiple git
repositories I pushed the incomplete backup copy of gnokii-extras with
the result that the CVS history wasn't preserved, not even the first
commit seemed right; this happened only for gnokii-extras as far as I
can tell.

I asked Savannah to delete and recreate it, but obviously this broke
existing cloned repos and the easiest solution is to clone it again:
git clone git://

If you try to pull from inside your old repo you'll probably get
something like this (copied here to make search engines happy):

$ git pull
warning: no common commits
remote: Counting objects: 469, done.
remote: Compressing objects: 100% (176/176), done.
remote: Total 469 (delta 198), reused 469 (delta 198)
Receiving objects: 100% (469/469), 82.91 KiB | 141 KiB/s, done.
Resolving deltas: 100% (198/198), done.
>From address@hidden:/srv/git/gnokii/gnokii-extras
 + b64e4a6...2cafa7f initial-import -> origin/initial-import  (forced update)
 + 4e83462...2ecd846 master     -> origin/master  (forced update)
 + fcba213...2ecd846 origin     -> origin/origin  (forced update)
>From address@hidden:/srv/git/gnokii/gnokii-extras
 * [new tag]         gnokii_0_5_0pre2 -> gnokii_0_5_0pre2
 * [new tag]         rel_0_4_0pre20 -> rel_0_4_0pre20
 * [new tag]         rel_0_4_0pre5 -> rel_0_4_0pre5
 * [new tag]         rel_0_6_4  -> rel_0_6_4
 * [new tag]         rel_0_6_9  -> rel_0_6_9
error: Entry 'bindings/PHP/gnokii4php/ChangeLog' not uptodate. Cannot merge.
fatal: merging of trees 0950cac39c5b6d8aa6c1425ceaa2a36cf9af6093 and
cfed83f6880126d97c6ec01df5e920b6421f639f failed
Merge with strategy recursive failed.

Daniele Forsi

reply via email to

[Prev in Thread] Current Thread [Next in Thread]