From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ludo@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) Newsgroups: gmane.lisp.guile.devel Subject: Re: Git import issues Date: Mon, 07 Apr 2008 21:57:33 +0200 Message-ID: <8763ut1lqq.fsf@gnu.org> References: <87skxyziza.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1207598366 11386 80.91.229.12 (7 Apr 2008 19:59:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 7 Apr 2008 19:59:26 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Mon Apr 07 21:59:59 2008 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JixUo-0003Ol-HR for guile-devel@m.gmane.org; Mon, 07 Apr 2008 21:59:14 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JixUB-0008PP-Er for guile-devel@m.gmane.org; Mon, 07 Apr 2008 15:58:35 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JixTT-00081u-Hk for guile-devel@gnu.org; Mon, 07 Apr 2008 15:57:51 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JixTR-00080g-UL for guile-devel@gnu.org; Mon, 07 Apr 2008 15:57:51 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JixTR-00080Z-K6 for guile-devel@gnu.org; Mon, 07 Apr 2008 15:57:49 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JixTR-0007hp-2m for guile-devel@gnu.org; Mon, 07 Apr 2008 15:57:49 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1JixTJ-0002EI-OS for guile-devel@gnu.org; Mon, 07 Apr 2008 19:57:42 +0000 Original-Received: from reverse-83.fdn.fr ([80.67.176.83]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 07 Apr 2008 19:57:41 +0000 Original-Received: from ludo by reverse-83.fdn.fr with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 07 Apr 2008 19:57:41 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 43 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: reverse-83.fdn.fr X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 19 Germinal an 216 de la =?iso-8859-1?Q?R=E9volution?= X-PGP-Key-ID: 0xEB1F5364 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 821D 815D 902A 7EAB 5CEE D120 7FBA 3D4F EB1F 5364 X-OS: i686-pc-linux-gnu User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Cancel-Lock: sha1:AWpSxKtWhDt72DCC382snlgY8r8= X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:7127 Archived-At: Hi all, After several trial and errors, a bit of googling, etc., I had to face it: `git-cvsimport' just doesn't manage to properly keep track of branches (there's been recent discussion on this topic on the Git list [0], giving the impression that `git-cvsimport' just can't do the job accurately). Fortunately, there are several alternatives [1]. I decided to try `cvs2git' [2], which is part of `cvs2svn'. The resulting import does not have the problems of the one currently on-line. To get more confidence in its correctness, I checked out "HEAD" and "branch_release-1-{6,8}" from CVS and then compared with `diff' the CVS-checkout and the Git-checkout trees for these branches (modulo `CVS' directories). The only differences are the CVS keyword in "qt/b.h" and deleted directories that are still visible in the CVS checkout but not in the import. For completeness, I also cloned the import, bootstrapped/built all 3 branches (BTW, 1.6's `autogen.sh' would need to be updated), and successfully ran "make check". The new repo takes 23 MiB after gc [3] and has 94 tags, 18 branches, and 10161 commits on `master' and 10617 on `branch_release-1-8' (interestingly, the broken repo had only 3863 on that branch!). This makes me confident that the import is not broken this time. Thus I'm planning to ask the Savannah admins to remove the old one and replace it with this one today. I'll take care of reapplying patches that were applied after the CVS import to the Git repository. If anyone has patches in their local Git repository cloned from the repository that's going to be replaced, I can describe the procedure used to reapply them on a newly-cloned repository. Thanks, Ludovic. [0] http://thread.gmane.org/gmane.comp.version-control.git/78674 [1] http://git.or.cz/gitwiki/InterfacesFrontendsAndTools#head-8870e1c81cc93f9a7a7acb5e969924ee60182d6b [2] http://cvs2svn.tigris.org/cvs2git.html [3] http://thread.gmane.org/gmane.comp.version-control.subversion.cvs2svn.devel/2154