From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/56393 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.gnus.general,gmane.emacs.devel Subject: Re: Gnus 5.11 in Emacs CVS Date: 15 Feb 2004 09:03:22 +0900 Sender: ding-owner@lists.math.uh.edu Message-ID: <87znbl2oqd.fsf@tc-1-100.kawasaki.gol.ne.jp> References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1076803454 10515 80.91.224.253 (15 Feb 2004 00:04:14 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 15 Feb 2004 00:04:14 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: ding-owner+M4933@lists.math.uh.edu Sun Feb 15 01:04:05 2004 Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1As9lV-0000wB-00 for ; Sun, 15 Feb 2004 01:04:05 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1As9kv-0004C2-00; Sat, 14 Feb 2004 18:03:29 -0600 Original-Received: from justine.libertine.org ([66.139.78.221] ident=postfix) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1As9km-0004Bu-00 for ding@lists.math.uh.edu; Sat, 14 Feb 2004 18:03:20 -0600 Original-Received: from main.gmane.org (main.gmane.org [80.91.224.249]) by justine.libertine.org (Postfix) with ESMTP id 26F723A0026 for ; Sat, 14 Feb 2004 18:03:20 -0600 (CST) Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1As9kk-0000ui-00 for ; Sun, 15 Feb 2004 01:03:19 +0100 Original-Received: from yokohama1-61-203-152-104.ap.0038.net ([61.203.152.104]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun Feb 15 00:03:19 2004 Original-Received: from miles by yokohama1-61-203-152-104.ap.0038.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun Feb 15 00:03:19 2004 X-Injected-Via-Gmane: http://gmane.org/ Original-To: ding@gnus.org Original-Lines: 45 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: yokohama1-61-203-152-104.ap.0038.net System-Type: i686-pc-linux-gnu Precedence: bulk Xref: main.gmane.org gmane.emacs.gnus.general:56393 gmane.emacs.devel:19946 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:56393 Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes: > If we need a branch, shouldn't it be in _Emacs_ CVS to test the > integration (e.g. check that new files have to be added to CVS, ...)? > I wonder how the merge has been done last time. I'd like to help with > it, but probably it would make more sense if someone with write access > to Emacs CVS does the first (big) step. Instead of CVS, you could use tla (aka `arch') and my emacs arch branch, which is synchronized with the emacs CVS trunk. tla allows (painlessly) distributed repositories, and generally uses a `pull' model, so write access to a central repository isn't necessary. It is also much better at merging than CVS. *** One part of this is that I've added `taglines' to all the emacs source files (in CVS), which make it easy to assign a unique identity to each file (even if the name changes). If you'd accept a patch against Gnus CVS to add taglines, this would make future merging using tla easier. This is slightly trickier than with a new project, because Gnus and Emacs conceptually _share_ files (even though the actual contents may vary), so it would be best to use the _same_ tagline for the same file in both Gnus and Emacs. An example of a tagline is something like `lisp/gnus/gnus-art.el' from the emacs source tree: .... (run-hooks 'gnus-art-load-hook) ;;; arch-tag: 2654516f-6279-48f9-a83b-05c1fa450c33 ;;; gnus-art.el ends here > Maybe we should shift (or cross-post) this discussion to emacs-devel? Couldn't hurt... [note CC: :-] -Miles -- `Suppose Korea goes to the World Cup final against Japan and wins,' Moon said. `All the past could be forgiven.' [NYT]