From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: Moving Emacs 24.3 development to emacs-24 branch soon Date: Thu, 01 Nov 2012 18:09:07 +0800 Message-ID: <874nl94ou4.fsf@gnu.org> References: <87txtajclb.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1351764567 1909 80.91.229.3 (1 Nov 2012 10:09:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 Nov 2012 10:09:27 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 01 11:09:36 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TTriR-0006aq-GH for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 11:09:35 +0100 Original-Received: from localhost ([::1]:42596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTriI-00057v-Uc for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 06:09:26 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:40514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTriF-000568-OX for emacs-devel@gnu.org; Thu, 01 Nov 2012 06:09:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTri6-0007KI-18 for emacs-devel@gnu.org; Thu, 01 Nov 2012 06:09:23 -0400 Original-Received: from mail-pa0-f41.google.com ([209.85.220.41]:34391) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTri5-0007Jt-Qt for emacs-devel@gnu.org; Thu, 01 Nov 2012 06:09:13 -0400 Original-Received: by mail-pa0-f41.google.com with SMTP id fa10so1744395pad.0 for ; Thu, 01 Nov 2012 03:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=n4Cs+PijTr2I3eEN9cV/WbeI0I+YwSbo2S2Mo5FyE3E=; b=ktoZ4TA3y2ob7Cm3sA/yv26omJFaokNV0zSj/ayuGwI01fyMf8uxiPZ6k4pjSAJ/Sh 6G72ZAGyKSprH+SOrBpYUun6GGErbxZLYGwmEVLhQiQOlrCbtANhnouIGadFhrzbKRMm 1Ia3Sy8cmQbFK2MfKMm6EX8NV9YcEErs3ONCdvjiVgQjyxWKXJKes0J2UQSAAOAMzRHB eCrAMnxeN8RlLxGt8vyRMXjb38S0wcdzGYSQvryTFCA5uxzif0rs1Yk04VI/mSJwlEKE gP9zYKCZR19pWY8k1zkWJ3QWXKNlsP1fVJ7tc61dLqru7zCiaHT1uv+ShicvH3E7Jo10 V2aQ== Original-Received: by 10.68.224.69 with SMTP id ra5mr120376363pbc.114.1351764553173; Thu, 01 Nov 2012 03:09:13 -0700 (PDT) Original-Received: from ulysses ([155.69.17.190]) by mx.google.com with ESMTPS id ay5sm3748770pab.1.2012.11.01.03.09.10 (version=SSLv3 cipher=OTHER); Thu, 01 Nov 2012 03:09:11 -0700 (PDT) In-Reply-To: (Andreas Schwab's message of "Thu, 01 Nov 2012 07:57:07 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.41 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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 Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:154606 Archived-At: Andreas Schwab writes: >> 1. In the `emacs-24' branch, `bzr tag emacs-24.3-base'. This creates a >> `emacs-24.3-base' tag for the current contents of the emacs-24 branch >> (which has accumulated ~40 commits since the 24.2 release), for the >> unlikely event that we need it again. > > You should create a branch instead. Your second step will lose the tag. The problem is the naming. It is desireable for the branch where the 24.3 work is done to be called emacs-24. How about branching emacs-24 to emacs-24-fallback before pushing trunk into emacs-24?