From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Gnus branch Date: 19 Aug 2004 14:26:18 -0400 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1092940027 17976 80.91.224.253 (19 Aug 2004 18:27:07 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 19 Aug 2004 18:27:07 +0000 (UTC) Cc: Reiner Steib , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 19 20:26:57 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1Bxrcn-0003bo-00 for ; Thu, 19 Aug 2004 20:26:57 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bxrh3-0007EI-To for ged-emacs-devel@m.gmane.org; Thu, 19 Aug 2004 14:31:21 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1Bxrgw-0007EC-Ui for emacs-devel@gnu.org; Thu, 19 Aug 2004 14:31:15 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1Bxrgw-0007E0-A9 for emacs-devel@gnu.org; Thu, 19 Aug 2004 14:31:14 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bxrgw-0007Dx-7O for emacs-devel@gnu.org; Thu, 19 Aug 2004 14:31:14 -0400 Original-Received: from [132.204.24.67] (helo=mercure.iro.umontreal.ca) by monty-python.gnu.org with esmtp (Exim 4.34) id 1BxrcS-0008P7-9l; Thu, 19 Aug 2004 14:26:36 -0400 Original-Received: from asado.iro.umontreal.ca (asado.iro.umontreal.ca [132.204.24.84]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id DE4F4B3027F; Thu, 19 Aug 2004 14:26:18 -0400 (EDT) Original-Received: by asado.iro.umontreal.ca (Postfix, from userid 20848) id 8E5C48CA23; Thu, 19 Aug 2004 14:26:18 -0400 (EDT) Original-To: rms@gnu.org In-Reply-To: Original-Lines: 28 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=0, requis 5) X-MailScanner-From: monnier@iro.umontreal.ca 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: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:26327 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26327 > I'm not sure how to handle the ChangeLog entries from Emacs/trunk: > Assuming that all the changes that we want are in the branch now, > and that the ChangeLog file in that branch describes those changes, > you should copy the ChangeLog file unmodified into the trunk > just as you copy the source files unmodified into the trunk. > However, it sounds like you're saying we have not yet reached that point: > Some other (maybe) important changes (by Stefan Monnier, Juanma > Barranquero, Kim F. Storm, Sam Steingold, ...) have not been installed > yet. > Can you identify these changes and merge the ones we need > into the branch? Just to clarify: my suggestion is to first merge the gnus branch on the trunk and then re-install the local changes that haven't made their way to the Gnus repository yet. For clarity of the history (i.e. to make future integration easier) it is important to have a Gnus branch that only contains code that comes from the Gnus repository. So we should either create a second Gnus branch (one for importing from the repository and a temporary one to do the current integration work before committing it to the trunk) or instead to just do the integration work directly on the trunk, which is easier. Stefan