From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Moving Emacs 24.3 development to emacs-24 branch soon Date: Thu, 01 Nov 2012 15:47:56 +0200 Message-ID: <83d2zx77ub.fsf@gnu.org> References: <87txtajclb.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1351777674 18211 80.91.229.3 (1 Nov 2012 13:47:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 Nov 2012 13:47:54 +0000 (UTC) Cc: emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 01 14:48:03 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 1TTv7q-0002iX-DX for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 14:48:02 +0100 Original-Received: from localhost ([::1]:57846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTv7f-0008T6-Im for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 09:47:51 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:52097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTv7c-0008SZ-Ti for emacs-devel@gnu.org; Thu, 01 Nov 2012 09:47:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTv7c-0002LU-4e for emacs-devel@gnu.org; Thu, 01 Nov 2012 09:47:48 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:54948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTv7a-0002KB-If; Thu, 01 Nov 2012 09:47:46 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0MCT00200A8OCA00@a-mtaout21.012.net.il>; Thu, 01 Nov 2012 15:47:38 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MCT001GZABEZL90@a-mtaout21.012.net.il>; Thu, 01 Nov 2012 15:47:38 +0200 (IST) In-reply-to: <87txtajclb.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.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:154612 Archived-At: > From: Chong Yidong > Date: Thu, 01 Nov 2012 10:12:16 +0800 > > 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'. I don't think you can do that. "push" is only possible from a branch that didn't diverge from the target. You should "merge" (from trunk to emacs-24) instead, and then commit. However, merging will probably mess up the history in a way that will make forensics difficult. So I agree with Andreas and Dani who proposed a separate branch instead.