From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "NIIMI Satoshi" Newsgroups: gmane.emacs.devel Subject: Re: [DIFFS] Re: Connection to emacs CVS broken ? Date: Sat, 17 Mar 2007 04:24:20 +0900 Message-ID: <7a2b18c80703161224v75a464cdxf87c29115dcafc79@mail.gmail.com> References: <17913.45372.941749.353301@kahikatea.snap.net.nz> <45F9C5E8.1010700@gnu.org> <87ps7am73r.fsf@catnip.gol.com> <17913.59348.720489.675967@kahikatea.snap.net.nz> <7a2b18c80703151956w4b8c2adbs6e993598ac9df87a@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1174073105 25815 80.91.229.12 (16 Mar 2007 19:25:05 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 16 Mar 2007 19:25:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 16 20:24:58 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HSI2q-0006oL-RO for ged-emacs-devel@m.gmane.org; Fri, 16 Mar 2007 20:24:57 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HSI3u-0006PV-5U for ged-emacs-devel@m.gmane.org; Fri, 16 Mar 2007 14:26:02 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HSI3T-00067b-2F for emacs-devel@gnu.org; Fri, 16 Mar 2007 15:25:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HSI3R-00066r-Eh for emacs-devel@gnu.org; Fri, 16 Mar 2007 15:25:34 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HSI3R-00066k-9f for emacs-devel@gnu.org; Fri, 16 Mar 2007 14:25:33 -0500 Original-Received: from wr-out-0506.google.com ([64.233.184.228]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HSI2H-0005Iq-WD for emacs-devel@gnu.org; Fri, 16 Mar 2007 15:24:22 -0400 Original-Received: by wr-out-0506.google.com with SMTP id 76so566734wra for ; Fri, 16 Mar 2007 12:24:21 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=A7wciHQYGEqT7iOa0sNrdeu+3VXV6l+DVN5JwO9fF5B/No3r76RZyufZGR0vPf+IAIKA+VrnEefqhQzf2apN8oK53At98j6eP6nly8upSjLuPrbUDJJvjfwL4EFecrv5fJ04k7w3jwnADW2p5tV6HJUN6KapDIClg8H5sHwSCNo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=bX74cpLyFPuGW3ac9CYTJyYlVy9JCBLymj2ZngzD3MPj3bGekE4UXLMSZEuikom1Uqp8d3VZOyJuPGKyyLynSaiahVO9+CQnRCyo2DhIgVJYXGUswtOI1Y5jut/gSdGEm3pDto2rxTGKK2mmO43uOy5icMSvs9mThFA9b6y1rW0= Original-Received: by 10.114.75.1 with SMTP id x1mr836016waa.1174073061031; Fri, 16 Mar 2007 12:24:21 -0700 (PDT) Original-Received: by 10.114.136.12 with HTTP; Fri, 16 Mar 2007 12:24:20 -0700 (PDT) In-Reply-To: Content-Disposition: inline X-Google-Sender-Auth: 254b1c888f88477a X-detected-kernel: Linux 2.4-2.6 (Google crawlbot) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:68015 Archived-At: 2007/3/17, Richard Stallman : > 4) extract changesets from my copy of CVS repository (e.g. convert the > repository to changeset based SCM), verify changesets missing in > savannah, commit them into savannah. > > Can you (or anyone) point us at documentation on how to do this? Here is a script to extract changesets with Mercurial (Distributed SCM) and cvs20hg (CVS to Mercurial converter). One problem of this script is extracted changeset "emacs-trunk-09" contains incorrect difference for "$Id$" since cvs20hg seems to ignore sticky flag for keyword expansion. But it can be fixed to edit the changeset by hand because its format is usual unified diff. --------CUT HERE-------- #! /bin/sh set -e -x # limit processing range for speed up date='2007-03-11 00:00:00 UTC' # path to savannah repository backup cvsroot_savannah=/repo/emacs # path to my repository backup cvsroot_new=/repo/bak/emacs workdir=/tmp/emacs.$$ mkdir ${workdir} cd ${workdir} # import initial source as of ${date} cvs -Q -R -d ${cvsroot_savannah} co -P -D "${date}" emacs find emacs -name CVS -type d | xargs rm -rf hg -q init emacs hg -q --cwd emacs commit -A -m 'initial commit' -d "${date}" -u admin # convert savannah repository backup to hg cvs20hg ${cvsroot_savannah} emacs emacs # get (1+ newest) revision new=$(expr $(hg -q -R emacs tip --template '{rev}') + 1) # convert my repository backup to hg cvs20hg ${cvsroot_new} emacs emacs # extract missing changesets hg -q -R emacs export -o emacs-trunk-%n ${new}: --------CUT HERE-------- -- NIIMI Satoshi