From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/57021
Path: main.gmane.org!not-for-mail
From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de>
Newsgroups: gmane.emacs.gnus.general,gmane.emacs.devel
Subject: Re: Gnus 5.11 in Emacs CVS
Date: Wed, 14 Apr 2004 22:24:23 +0200
Sender: ding-owner@lists.math.uh.edu
Message-ID: <v9oepugvew.fsf@marauder.physik.uni-ulm.de>
References: <rj7k06zmk1.fsf@sheridan.dina.kvl.dk>
	<microsoft-free.87fzeum6wc.fsf@eicq.dnsalias.org>
	<v9ptdyawd8.fsf@marauder.physik.uni-ulm.de>
	<m3ekudy88y.fsf@quimbies.gnus.org>
	<v9ptdu9vao.fsf@marauder.physik.uni-ulm.de>
	<v94quza3q9.fsf@marauder.physik.uni-ulm.de>
	<m33ca8e8db.fsf@defun.localdomain>
	<v9u12oko79.fsf@marauder.physik.uni-ulm.de>
	<87znbl2oqd.fsf@tc-1-100.kawasaki.gol.ne.jp>
Reply-To: Reiner Steib <reiner.steib@gmx.de>
NNTP-Posting-Host: deer.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: sea.gmane.org 1081974321 22447 80.91.224.253 (14 Apr 2004 20:25:21 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Wed, 14 Apr 2004 20:25:21 +0000 (UTC)
Cc: Miles Bader <miles@gnu.org>,
	Lars Magne Ingebrigtsen <larsi@gnus.org>
Original-X-From: ding-owner+M5561@lists.math.uh.edu Wed Apr 14 22:25:09 2004
Return-path: <ding-owner+M5561@lists.math.uh.edu>
Original-Received: from malifon.math.uh.edu ([129.7.128.13])
	by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BDqwW-0005qo-00
	for <ding-account@gmane.org>; Wed, 14 Apr 2004 22:25:09 +0200
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 1BDqwD-0006hh-00; Wed, 14 Apr 2004 15:24:49 -0500
Original-Received: from util2.math.uh.edu ([129.7.128.23])
	by malifon.math.uh.edu with esmtp (Exim 3.20 #1)
	id 1BDqw5-0006hb-00
	for ding@lists.math.uh.edu; Wed, 14 Apr 2004 15:24:41 -0500
Original-Received: from justine.libertine.org ([66.139.78.221] ident=postfix)
	by util2.math.uh.edu with esmtp (Exim 4.30)
	id 1BDqw2-0007oK-69
	for ding@lists.math.uh.edu; Wed, 14 Apr 2004 15:24:38 -0500
Original-Received: from lumberjack.physik.uni-ulm.de (lumberjack.physik.uni-ulm.de [134.60.10.173])
	by justine.libertine.org (Postfix) with ESMTP
	id B828C3A0027; Wed, 14 Apr 2004 15:24:35 -0500 (CDT)
Original-Received: by lumberjack.physik.uni-ulm.de (Postfix, from userid 170)
	id 701FD1815C; Wed, 14 Apr 2004 22:24:23 +0200 (CEST)
Original-To: ding@gnus.org, emacs-devel@gnu.org
Mail-Followup-To: ding@gnus.org, emacs-devel@gnu.org
X-Face: 3Phac&+dw=IZHjhua]bp}LH<*p{qzj8u+<OV~fQY=S61n*cJ|<hmq6\]&vOTQs+z`}WHHM/
 E?ZYqI^aM0-^*)pWU&1tb.Tw}GDqeE.+(!jEP8@b&IcxNU1QQz%1d1;aeOzyizTPc;q(88/ar*bN|S
 IU"]xqU`R)i%Jp-lu3<!7QjP@,9xqE@*G{3ESw3x#1N1?,(r0&q(1LKm)hS@d89lfo+'=Y$#7"g<&v
 hNp|fgfb<eK="G5fxvZ3FyyWQNI9JL+C<g
User-Agent: Gnus/5.110002 (No Gnus v0.2) Emacs/21.3 (gnu/linux)
Precedence: bulk
Xref: main.gmane.org gmane.emacs.gnus.general:57021 gmane.emacs.devel:21639
X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:57021

On Sun, Feb 15 2004, Miles Bader wrote:

> 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.

Do I understand you correctly that if I managed to merge Gnus into an
arch archive of Emacs, you would sync the archive to Emacs CVS trunk?

I've never used tla before.  I installed it now and will read some
introductory documentation soon (from wiki.gnuarch.org).  It would be
very helpful for me if you could give me a brief (or even better: not
so brief ;-)) description of the necessary steps.

> 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.

I cannot speak for Lars, but I don't think he would refuse.  Lars?
(If Lars agrees on this, I can commit your patches to Gnus CVS).

> 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.

Apart from the trunk, we have a branch "v5-10" for the 5.10 series.
Probably they should be added in both branches?

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo--- PGP key available via WWW   http://rsteib.home.pages.de/