From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-return-35886-listarch-gdb=sources.redhat.com@sourceware.org>
Received: (qmail 902 invoked by alias); 8 Oct 2009 09:20:55 -0000
Received: (qmail 878 invoked by uid 22791); 8 Oct 2009 09:20:54 -0000
X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 	tests=AWL,BAYES_00,SPF_PASS
X-Spam-Check-By: sourceware.org
Received: from mx.meyering.net (HELO mx.meyering.net) (82.230.74.64)     by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 08 Oct 2009 09:20:50 +0000
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) 	id 97D7D4E1F2; Thu,  8 Oct 2009 11:20:47 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: Joel Brobecker <brobecker@adacore.com>
Cc: gdb@sourceware.org
Subject: Re: gdb.git hiccup
In-Reply-To: <20091007192519.GK16338@adacore.com> (Joel Brobecker's message of 	"Wed, 7 Oct 2009 12:25:20 -0700")
References: <87ws3clkx8.fsf@meyering.net> <87r5tklij2.fsf@meyering.net> 	<87k4zclc87.fsf@meyering.net> <20091006220321.GA12017@adacore.com> 	<87hbubxnn2.fsf@meyering.net> <20091007192519.GK16338@adacore.com>
Date: Thu, 08 Oct 2009 09:20:00 -0000
Message-ID: <87k4z6utqo.fsf@meyering.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-IsSubscribed: yes
Mailing-List: contact gdb-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb.sourceware.org>
List-Subscribe: <mailto:gdb-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb/>
List-Post: <mailto:gdb@sourceware.org>
List-Help: <mailto:gdb-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-owner@sourceware.org
X-SW-Source: 2009-10/txt/msg00159.txt.bz2

Joel Brobecker wrote:
> > I'll build the newer version and make my cvs-to-git process use it.
> > It can only help.  Though it can't repair the current holes in gdb.git.
> > Regarding that, if one of you gdb developers who use gdb.git can send
> > me git format-patch output that makes a clone from gdb.git identical to
> > a just-checked-out-from-cvs gdb directory, I will push it to both the
> > staging and public repositories.
>
> Here is a patch that should do the trick.

FYI, here's what I've done to the public git repo:

    cvs -d /cvs/src co -P gdb  # creates "src/"
    git clone /git/gdb.git gdb-git
    diff -Naur -xCVS -x.git gdb-git src > k
    cd gdb-git
    patch -p1 < ../k
    git add .
    git ci -m 'manually sync from the CVS repository' -a
    git push

Then I did the same to the staging directory into which
cvs-to-git changes are first deposited, and from which
the hourly cron pushes to the public repo.

Now, the checkout/clone-and-comparison shows that the only difference
is the empty contrib/ directory (only-in-cvs in spite of -P):

    cvs -d /cvs/src co -P gdb && git clone /git/gdb.git gdb-git \
      && diff -ru -xCVS -x.git src gdb-git
    Only in src: contrib
    [Exit 1]

With that, and the newly-installed cvsps-2.2b1, let's hope the git
repository stays in sync.  I'm now running this script via cron every hour,
so if something fails to propagate, I'll know right away.

#!/bin/sh
# Ensure that CVS checkout and git clone produce the same tree.

set -e
tmp=$(mktemp -d)

cleanup()
{
  __st=$?;
  rm -rf "$tmp"
  exit $__st
}
trap cleanup 0
trap 'exit $?' 1 2 13 15

cd "$tmp"
cvs -Q -d /cvs/src co -P gdb
git clone -q /git/gdb.git gdb-git
rm -rf src/contrib/CVS
rmdir src/contrib
diff -ru -xCVS -x.git src gdb-git