From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.comp.version-control.arch.user,gmane.emacs.devel Subject: [arch-users] Re: cvs <-> arch mirroring scripts Date: 14 Aug 2003 18:35:07 +0900 Sender: arch-users-admin@lists.fifthvision.net Message-ID: References: <1060744673.2522.27.camel@columbia> <1060803518.28891.27.camel@columbia> Reply-To: arch-users@lists.fifthvision.net NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1060853766 16549 80.91.224.253 (14 Aug 2003 09:36:06 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 14 Aug 2003 09:36:06 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: arch-users-admin@lists.fifthvision.net Thu Aug 14 11:36:05 2003 Return-path: Original-Received: from mail.000domains.com ([64.66.104.205]) by deer.gmane.org with smtp (Exim 3.35 #1 (Debian)) id 19nEWa-0005S3-00 for ; Thu, 14 Aug 2003 11:36:04 +0200 Original-Received: (qmail 15624 invoked from network); 14 Aug 2003 09:36:02 -0000 Original-Received: from mail.000domains.com (64.66.104.205) by mail.000domains.com with SMTP; 14 Aug 2003 09:36:02 -0000 Original-Received: (qmail 15519 invoked from network); 14 Aug 2003 09:35:15 -0000 Original-Received: from tyo201.gate.nec.co.jp (202.32.8.214) by mail.000domains.com with SMTP; 14 Aug 2003 09:35:15 -0000 Original-Received: from mailgate3.nec.co.jp (mailgate53.nec.co.jp [10.7.69.192]) by TYO201.gate.nec.co.jp (8.11.6/3.7W01080315) with ESMTP id h7E9ZA113088; Thu, 14 Aug 2003 18:35:10 +0900 (JST) Original-Received: from mailsv3.nec.co.jp (mailgate51.nec.co.jp [10.7.69.196]) by mailgate3.nec.co.jp (8.11.6/3.7W-MAILGATE-NEC) with ESMTP id h7E9Z9T18291; Thu, 14 Aug 2003 18:35:09 +0900 (JST) Original-Received: from edtmg05.lsi.nec.co.jp ([10.26.17.202]) by mailsv3.nec.co.jp (8.11.6p2/3.7W-MAILSV4-NEC) with ESMTP id h7E9Z8Q04212; Thu, 14 Aug 2003 18:35:08 +0900 (JST) Original-Received: from mcsss2.ucom.lsi.nec.co.jp (localhost [127.0.0.1]) by edtmg05.lsi.nec.co.jp (8.9.3p2+3.2W/3.7W_EDC_Ver.1.0) with ESMTP id SAA28597; Thu, 14 Aug 2003 18:35:08 +0900 (JST) Original-Received: from mcspd15.ucom.lsi.nec.co.jp (mcspd15 [10.30.114.174]) by mcsss2.ucom.lsi.nec.co.jp (8.12.8/8.12.8/EDcg v2.01-mc/1046780839) with ESMTP id h7E9Z8NH016630; Thu, 14 Aug 2003 18:35:08 +0900 (JST) Original-Received: by mcspd15.ucom.lsi.nec.co.jp (Postfix, from userid 31295) id B3A0C3723; Thu, 14 Aug 2003 18:35:07 +0900 (JST) Original-To: arch-users@lists.fifthvision.net Mail-Followup-To: arch-users@lists.fifthvision.net, emacs-devel@gnu.org System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: <1060803518.28891.27.camel@columbia> Original-Lines: 49 Errors-To: arch-users-admin@lists.fifthvision.net X-BeenThere: arch-users@lists.fifthvision.net X-Mailman-Version: 2.0.13 Precedence: bulk X-Reply-To: Miles Bader List-Help: List-Post: List-Subscribe: , List-Id: Arch users discussion list. List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.comp.version-control.arch.user:3158 gmane.emacs.devel:15940 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:15940 BTW, I checked in my first two changesets from arch->CVS for emacs today: I just did `tla update' in my, then generated a CVS log message from the arch log, e.g.: tla cat-log miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-14 | sed -n '/^Standard-date:/d;/^Date:/d;/^[^:]*:.*[^ ]/p;/^$/,$p' > /tmp/,l Then committed the whole tree: cvs commit -F/tmp/,l This generates CVS log entries like this: ---------------------------- revision 1.43 date: 2003/08/14 09:05:44; author: miles; state: Exp; lines: +2 -2 Revision: emacs--cvs-trunk--0--patch-14 Archive: miles@gnu.org--gnu-2003 Creator: Miles Bader Summary: Avoid .arch-ids dirs when making autoloads Modified-files: ./lisp/Makefile.in New-patches: miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-14 Avoid .arch-ids dirs when making autoloads ---------------------------- Which I think is nice, and gives you some useful info about which arch changeset the change came from. Note that the arch-changeset's author is included in the message, which helps ameliorate the `single CVS checkin point' a bit. I'm gonna try to make a script to do some of this, though at first it will probably just abort if detects any hard things (like renames or conflicts) and let the invoker deal with them. The one case that I'm bit concerned about is the old standard -- ChangeLog files. In the above changesets I actually forgot to update the ChangeLog, so it wasn't an issue :-), but in general, I suppose it's going to be necessary to resolve `trivial' ChangeLog conflicts automatically. Luckily, I think this is fairly easy -- just look for a ChangeLog.rej file that contains only add-lines-at-the-beginning, and translate it into text to prepend to the ChangeLog -- but I know people have rejected such automated merging of ChangeLogs for CVS in the past; anyone know more details? -Miles -- Saa, shall we dance? (from a dance-class advertisement)