From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Moving Emacs 24.3 development to emacs-24 branch soon Date: Thu, 01 Nov 2012 13:22:05 -0400 Message-ID: References: <87txtajclb.fsf@gnu.org> <83d2zx77ub.fsf@gnu.org> <874nl95ss4.fsf@gnu.org> <87bofhjnc2.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1351790548 10069 80.91.229.3 (1 Nov 2012 17:22:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 Nov 2012 17:22:28 +0000 (UTC) Cc: Eli Zaretskii , Chong Yidong , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 01 18:22:35 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 1TTyTN-0000j4-Na for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 18:22:29 +0100 Original-Received: from localhost ([::1]:33258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTyTF-0004dB-2U for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 13:22:21 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTyT8-0004aH-6O for emacs-devel@gnu.org; Thu, 01 Nov 2012 13:22:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTyT7-0007Xa-6h for emacs-devel@gnu.org; Thu, 01 Nov 2012 13:22:14 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:40014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTyT2-0007WJ-Jd; Thu, 01 Nov 2012 13:22:08 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAG6Zu0/O+LET/2dsb2JhbABEtBGBCIIVAQEEAVYjBQsLNBIUGA0kiBwFugmQRAOjM4FYgwU X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="203324857" Original-Received: from 206-248-177-19.dsl.teksavvy.com (HELO pastel.home) ([206.248.177.19]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 01 Nov 2012 13:22:05 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 8B6DD58C9F; Thu, 1 Nov 2012 13:22:05 -0400 (EDT) In-Reply-To: <87bofhjnc2.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Fri, 02 Nov 2012 01:32:29 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:154618 Archived-At: > Rebasing also theoretically messes up the bloodlines. The code in the > 24.3 release is *not* a child of the 24.2 release, it is a sibling. You're confused. There is no rebasing going on. The `push' will work just fine because we've merged the emacs-24 branch into trunk (and have done so regularly). The only reason append_revisions_only needs to be switched off is because this `push' will swap the mainline. Stefan