From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dani Moncayo Newsgroups: gmane.emacs.devel Subject: Re: Moving Emacs 24.3 development to emacs-24 branch soon Date: Thu, 1 Nov 2012 10:30:56 +0100 Message-ID: References: <87txtajclb.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 X-Trace: ger.gmane.org 1351762479 17266 80.91.229.3 (1 Nov 2012 09:34:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 Nov 2012 09:34:39 +0000 (UTC) Cc: Chong Yidong , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 01 10:34:48 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 1TTrAh-0005kc-Mj for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 10:34:43 +0100 Original-Received: from localhost ([::1]:41789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTrAZ-0003SZ-4d for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 05:34:35 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTrAU-0003Gb-6X for emacs-devel@gnu.org; Thu, 01 Nov 2012 05:34:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTrAQ-0005zZ-5G for emacs-devel@gnu.org; Thu, 01 Nov 2012 05:34:30 -0400 Original-Received: from mail-ob0-f169.google.com ([209.85.214.169]:52409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTr73-0005Yc-Mr; Thu, 01 Nov 2012 05:30:57 -0400 Original-Received: by mail-ob0-f169.google.com with SMTP id va7so2588881obc.0 for ; Thu, 01 Nov 2012 02:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=wvk5MByaYURalDr6na/iKs81ipBPoMy7as7w1vum7lw=; b=B8wFpaBiAliWqK1/2ljNBv07DROq843oAvXaionHF5VUgmb4MWd+miIl0B108ceoQp n3FsgG4NCdg6aFzXUv6sD+5KF9LP+eH2tixdD4kxN4zfGIZDrw7hIsBoykxM1eirjJ2X bvzG36aoq2uCEu8yy0MfH8rXnafxztDzDjwaJkf/3cTetMd0/lEVwq8F6nCRHLV5ilVh jge2cUo6LEY5JngFEuzZhvvpwkFnB6b3bP83Asva61S2QHzSoqOCIa4IosBxVYusQicm N3CHHxfvTwGzpJylqy/H299q+Bh4jZ4Vq9Md7po4U4nmq7F2Htys7Nb1ikaPAxyeJPAz 355Q== Original-Received: by 10.60.169.198 with SMTP id ag6mr33320688oec.35.1351762256382; Thu, 01 Nov 2012 02:30:56 -0700 (PDT) Original-Received: by 10.60.131.168 with HTTP; Thu, 1 Nov 2012 02:30:56 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.214.169 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:154605 Archived-At: >> 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. > >> 2. In the `trunk' branch, >> bzr push bzr+ssh://NAME@bzr.savannah.gnu.org/emacs/emacs-24 >> This pushes the contents of `trunk' into `emacs-24'. Also, Andreas' proposal of creating a new branch would avoid the problem I pointed out here http://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00672.html -- Dani Moncayo