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: Release branch plans Date: Tue, 03 Apr 2012 21:07:27 +0300 Message-ID: <83obr8d6zk.fsf@gnu.org> References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <87ehs5t7bl.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1333476492 3085 80.91.229.3 (3 Apr 2012 18:08:12 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 18:08:12 +0000 (UTC) Cc: cyd@gnu.org, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 20:08:10 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 1SF89H-0005yz-Ot for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 20:08:07 +0200 Original-Received: from localhost ([::1]:33429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF89H-00019m-2H for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 14:08:07 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF89D-000197-UD for emacs-devel@gnu.org; Tue, 03 Apr 2012 14:08:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF899-0002r4-64 for emacs-devel@gnu.org; Tue, 03 Apr 2012 14:08:03 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:33436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF896-0002qE-23; Tue, 03 Apr 2012 14:07:56 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0M1X00B000SUYA00@a-mtaout22.012.net.il>; Tue, 03 Apr 2012 21:07:16 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.127.55.144]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M1X00B3J103EXC0@a-mtaout22.012.net.il>; Tue, 03 Apr 2012 21:07:16 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.172 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:149348 Archived-At: > From: Stefan Monnier > Date: Tue, 03 Apr 2012 09:50:47 -0400 > Cc: emacs-devel@gnu.org > > > Would the "copy everything over" step munge the history on > > the emacs-24 branch? > > If the trunk has merged everything from the emacs-24 branch (which will > be the case), then the "copy over" can be done with a plain normal > "push", i.e. without losing any history. The history will be insanely messy after that anyway, so I wouldn't bother. Just "bzr pull --overwrite" and commit. If the trunk will be copied into emacs-24, then the history of trunk at that point really _becomes_ the history of emacs-24.