From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: Emacs 22 branch created. Date: Tue, 24 Apr 2007 21:33:14 +0100 Message-ID: <462E698A.2010309@gnu.org> References: <87d51uletj.fsf@stupidchicken.com> <462E37B5.4080404@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1177446809 19273 80.91.229.12 (24 Apr 2007 20:33:29 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 24 Apr 2007 20:33:29 +0000 (UTC) Cc: Chong Yidong , emacs-devel@gnu.org To: "Kim F. Storm" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 24 22:33:26 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HgRhV-0002tV-0F for ged-emacs-devel@m.gmane.org; Tue, 24 Apr 2007 22:33:25 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HgRn2-0003la-Gg for ged-emacs-devel@m.gmane.org; Tue, 24 Apr 2007 16:39:08 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HgRmz-0003lF-1l for emacs-devel@gnu.org; Tue, 24 Apr 2007 16:39:05 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HgRmx-0003kj-Bg for emacs-devel@gnu.org; Tue, 24 Apr 2007 16:39:04 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HgRmx-0003kc-3Z for emacs-devel@gnu.org; Tue, 24 Apr 2007 16:39:03 -0400 Original-Received: from outmail1.freedom2surf.net ([194.106.33.237]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HgRhO-0004Hp-Md for emacs-devel@gnu.org; Tue, 24 Apr 2007 16:33:18 -0400 Original-Received: from [127.0.0.1] (i-83-67-23-108.freedom2surf.net [83.67.23.108]) by outmail1.freedom2surf.net (Postfix) with ESMTP id A86BA51106; Tue, 24 Apr 2007 21:33:17 +0100 (BST) User-Agent: Thunderbird 2.0.0.0 (Windows/20070326) In-Reply-To: <462E37B5.4080404@gnu.org> X-detected-kernel: Linux 2.4-2.6 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: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:69971 Archived-At: Jason Rumney wrote: > Kim F. Storm wrote: >> I'm not sure how to clean this up (or create the missing base tag). > > cvs -d ... co -D "2007-04-24 02:51" > cvs diff -r EMACS_22_BASE > > manually fix up any differences by checking out the right revision of > the file from the trunk (don't use -r EMACS_22_BASE!). > > cvs tag EMACS_22_BRANCHPOINT I've created the tag EMACS_22_BRANCHPOINT. Due to python.el and version number changes on the branch, I did the diff one hour forwards and backwards from the time above - which is the time Chong sent the announcement, to ensure I had the correct revisions. The only changes in that timeframe were to src/xdisp.c and src/Changelog by Chong before the branch, so I am pretty sure -D "2007-04-24 02:51" gives the correct revisions for all files. It may be possible to rename EMACS_22_BASE to EMACS_22_RC using cvs tag -A, depending on how that is implemented - if it creates a new tag pointing to the same versions then it should work, but if it creates a real alias, as the name suggests, then it could have disasterous consequences when we change EMACS_22_BASE to replace EMACS_22_BRANCHPOINT (the latter is easily done).