From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Roger Leigh" Subject: git-cvsimport produces different (broken) repos when using pserver or local repo access Date: Mon, 27 Oct 2008 00:25:40 +0000 Message-ID: <20081027002539.GB3399@codelibre.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="HG+GLK89HZ1zG0kk" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Oct 27 01:27:12 2008 connect(): Connection refused Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KuFwt-0003hd-5w for gcvg-git-2@gmane.org; Mon, 27 Oct 2008 01:27:11 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751403AbYJ0AZz (ORCPT ); Sun, 26 Oct 2008 20:25:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751389AbYJ0AZz (ORCPT ); Sun, 26 Oct 2008 20:25:55 -0400 Received: from nagini.codelibre.net ([80.68.93.164]:3918 "EHLO nagini.codelibre.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbYJ0AZy (ORCPT ); Sun, 26 Oct 2008 20:25:54 -0400 Received: by nagini.codelibre.net (Postfix, from userid 107) id DF7417C1B1; Mon, 27 Oct 2008 00:25:50 +0000 (GMT) Received: from whinlatter.ukfsn.org (78-105-115-105.zone3.bethere.co.uk [78.105.115.105]) by nagini.codelibre.net (Postfix) with ESMTPSA id 6FAAF7C012 for ; Mon, 27 Oct 2008 00:25:44 +0000 (GMT) Received: by whinlatter.ukfsn.org (sSMTP sendmail emulation); Mon, 27 Oct 2008 00:25:40 +0000 Content-Disposition: inline X-GPG-Key: 0x25BFB848 X-Debian: testing/unstable X-OS-Uptime: 11:31:31 up 7 min, 1 user, load average: 1.43, 1.09, 0.51 User-Agent: Mutt/1.5.18 (2008-05-17) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.1.7 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --HG+GLK89HZ1zG0kk Content-Type: multipart/mixed; boundary="vGgW1X5XWziG23Ko" Content-Disposition: inline --vGgW1X5XWziG23Ko Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, I've noticed that git-cvsimport can under some circumstances produce broken repositories. This appears to only occur when using pserver access to the = CVS repo; running with a local repo is apparently fine, with all tested versions giving the same repo (master head has same hash for the last commit). In all cases cvsps version 2.1 was used. Repo source: pserver :pserver:anonymous@gimp-print.cvs.sourceforge.net:/cvsroot/gimp-pri= nt local rsync -av 'rsync://gimp-print.cvs.sourceforge.net/cvsroot/gimp-prin= t/*' cvs-backup I've tested with a number of git versions, including git.git as of yesterda= y: git version repo last commit URI 1.5.5.GIT local a51c479826 git://git.debian.org/git/u= sers/rleigh/gutenprint-upstream.git 1.5.5.GIT (2 failures) pserver bfa6f8248a git://git.debian.org/git/u= sers/rleigh/gutenprint-upstream-broken.git 1.5.5.GIT (no failure) pserver bfa6f8248a git://git.debian.org/git/u= sers/rleigh/gutenprint-upstream-pserver.git 1.5.6.5 local a51c479826 git://git.debian.org/git/u= sers/rleigh/gutenprint-upstream-git1.5.6.5-local.git 1.5.6.5 pserver 6f0950c097 git://git.debian.org/git/u= sers/rleigh/gutenprint-upstream-git1.5.6.5-pserver.git git.git 1.6.0.3.517.g759a local a51c479826 git://git.debian.org/git/u= sers/rleigh/gutenprint-upstream-git1.6-local.git git.git 1.6.0.3.517.g759a pserver 6f0950c097 git://git.debian.org/git/u= sers/rleigh/gutenprint-upstream-git1.6-pserver.git With git 1.5.5 I'm tracking the CVS repo running git-cvsimport every 20 mins =66rom a cron job. A few months ago it managed to botch, resulting in a br= oken repo (it didn't delete files deleted from CVS). I think this occurs when git-cvsimport fails (I get a perl error, though I'm afraid I don't have the= log anymore); running again results in successful completion, but the repo is screwed, I think due to that commit being incomplete or something. This occured twice during the import in the second line in the above table, in t= his case resulting in missing files (src/cups/i18n.*). Again, I'm afraid I don= 't have the logs, but I can repeat again if this is not an already known/fixed issue. The repo is quite big, taking several hours to import, so it might possibly be a network connection problem and it's not handling that correct= ly on failure. However, even when the import comples successfully (line 3), t= he hash is still the same as line 2 where it failed twice and needed restartin= g. So, it looks like depending on if I use a local repo directly or remove via pserver, I get a different repo. 1.5.5 using pserver is different to later versions, presumably this is a buggy version because it's broken whether or= not I get a failure. Later versions always completed without failure; while the local and pserver using repos differ, they do both seem OK. However, I wou= ld have expected identical results, given that they are all created from the same data. The script I used to do the import is attached. Regards, Roger --=20 .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/ `- GPG Public Key: 0x25BFB848 Please GPG sign your mail. --vGgW1X5XWziG23Ko Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=gutenprint-bootstrap #!/bin/bash CVSROOT=:pserver:anonymous@gimp-print.cvs.sourceforge.net:/cvsroot/gimp-print CVSMODULE=print HOME=/home/users/rleigh GIT_DIR=/var/lib/gforge/chroot/home/users/rleigh/public_git/gutenprint-upstream.git LOGDIR=${HOME}/log LOCKFILE=${HOME}/gutenprint-cvs.lock AUTHORS=${HOME}/gutenprint-auth #date -R lockfile -2 -r 2 ${LOCKFILE} # If we managed to lock the file if [ $? -eq 0 ]; then # echo "Running git-cvsimport" export GIT_DIR export CVSROOT git-cvsimport -A $AUTHORS -i -v print rm -f ${LOCKFILE} else echo "Couldn't get lock for cvssuck" fi #date -R --vGgW1X5XWziG23Ko Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=gutenprint-auth andystewart=Andy Stewart anikin=Eugene Anikin cpbs=Charles Briscoe-Smith daberti=Daniele Berti davehill=Dave Hill degger=Daniel Egger doctormo=Martin Owens dpace=David Pace easysw=Mike Sweet faust3=Sascha Sommer gandy=Andy Thaller gtaylor=Grant Taylor iay=Ian Young jmv=Jean-Marc Verbavatz julianbradfield=Julian Bradfield khk=Karl Heinz Kremer m0m=Michael Mraka mbroughtn=mbroughtn menthos=Christian Rose mitsch=Michael Natterer mtomlinson=Mark Tomlinson nestordi=nestor di nicholas=nicholas peter_missel=Peter Missel rblancha=Richard Blanchard rleigh=Roger Leigh rlk=Robert Krawitz rwisi=Richard Wisenoecker sharkey=Eric Sharkey smiller=Steve Miller spa=Salvador Abreu stevek=Steve Kann tillkamppeter=Till Kamppeter ttonino=Thomas Tonino tylerb=Tyler Blessing uid21630=uid21630 wiz=Joseph S. Wisniewski wollvieh=Wolfgang Bauer zoopa =Pete Parks --vGgW1X5XWziG23Ko-- --HG+GLK89HZ1zG0kk Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkkFCoMACgkQVcFcaSW/uEh6UQCg8xsNdnYMRpc7e7cz5zRqzkjg jisAnRuMC5JB7bb3wxDssLsTsN2QWh2K =cn+r -----END PGP SIGNATURE----- --HG+GLK89HZ1zG0kk--