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: Gnus branch Date: 12 Aug 2004 19:54:54 -0400 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1092354939 5201 80.91.224.253 (12 Aug 2004 23:55:39 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 12 Aug 2004 23:55:39 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 13 01:55:29 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 1BvPPt-0007hB-00 for ; Fri, 13 Aug 2004 01:55:29 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BvPTk-00056W-RT for ged-emacs-devel@m.gmane.org; Thu, 12 Aug 2004 19:59:28 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1BvPTe-00056J-0O for emacs-devel@gnu.org; Thu, 12 Aug 2004 19:59:22 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1BvPTd-00055w-2P for emacs-devel@gnu.org; Thu, 12 Aug 2004 19:59:21 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BvPTc-00055t-VT for emacs-devel@gnu.org; Thu, 12 Aug 2004 19:59:21 -0400 Original-Received: from [132.204.24.67] (helo=mercure.iro.umontreal.ca) by monty-python.gnu.org with esmtp (Exim 4.34) id 1BvPPc-0000P4-KI for emacs-devel@gnu.org; Thu, 12 Aug 2004 19:55:12 -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 53C01B3027B; Thu, 12 Aug 2004 19:54:54 -0400 (EDT) Original-Received: by asado.iro.umontreal.ca (Postfix, from userid 20848) id 2AC0C8CA23; Thu, 12 Aug 2004 19:54:54 -0400 (EDT) Original-To: emacs-devel@gnu.org Original-Lines: 24 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:26260 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26260 I find the separate branch for Gnus to be inconvenient. Since it seems the code already works well as it is, I think it makes more sense to move it to the trunk right away and to then do "merge left over changes" on the trunk rather than on the branch. This way more people will test the new code earlier and we can keep the branch as a pseudo "vendor branch" (where we only import unmolested code straight from the Gnus repository but where we never commit ourselves). I.e. I suggest we: cd emacs/lisp/gnus cvs update -A cvs tag before-gnus-5_10-switch cvs update -j gnus-5_10-branch cvs commit -m 'switch to v5_10' The `tag' command is not srictly necessary since the gnus-5_10-branchpoint tag is equivalent. And since no activity took place on the trunk of the gnus code since the creation of the branch, the `update -j' doesn't generate any conflict. Stefan