From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: bignum branch Date: Thu, 09 Aug 2018 21:28:51 +0300 Message-ID: <83mutvo0m4.fsf@gnu.org> References: <87o9fbbw1t.fsf@tromey.com> <83wotxaiwi.fsf@gnu.org> <86k1pxmvmx.fsf@gmail.com> <87efg4a9xc.fsf@tromey.com> <87a7qr8cz7.fsf@tromey.com> <86tvoy3je9.fsf@gmail.com> <86bmb0vbxf.fsf@gmail.com> <87k1pnfcg1.fsf@tromey.com> <86sh4b1833.fsf@gmail.com> <861sbgz3dm.fsf@gmail.com> <83a7q4ufxp.fsf@gnu.org> <87wot71hpb.fsf@tromey.com> <86in4rgt1m.fsf@gmail.com> <83pnyyu0k1.fsf@gnu.org> <86k1p59haq.fsf@gmail.com> <83va8osuz2.fsf@gnu.org> <87ftzrknyg.fsf@tromey.com> <87d0usjvse.fsf@tromey.com> <837el0p8u5.fsf@gnu.org> <87y3df7b2k.fsf@tromey.com> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1533839217 29912 195.159.176.226 (9 Aug 2018 18:26:57 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Aug 2018 18:26:57 +0000 (UTC) Cc: andrewjmoreton@gmail.com, emacs-devel@gnu.org To: Tom Tromey Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 09 20:26:53 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fnpe9-0007i0-Bt for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 20:26:53 +0200 Original-Received: from localhost ([::1]:52334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnpgG-0003Hu-0o for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 14:29:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnpg5-0003Gd-Aa for emacs-devel@gnu.org; Thu, 09 Aug 2018 14:28:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnpg4-0002up-DL for emacs-devel@gnu.org; Thu, 09 Aug 2018 14:28:53 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnpg4-0002uh-8e; Thu, 09 Aug 2018 14:28:52 -0400 Original-Received: from [176.228.60.248] (port=4613 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fnpg3-0005QR-Mh; Thu, 09 Aug 2018 14:28:52 -0400 In-reply-to: <87y3df7b2k.fsf@tromey.com> (message from Tom Tromey on Thu, 09 Aug 2018 10:34:59 -0600) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:228340 Archived-At: > From: Tom Tromey > Cc: Tom Tromey , andrewjmoreton@gmail.com, emacs-devel@gnu.org > Date: Thu, 09 Aug 2018 10:34:59 -0600 > > Eli> If you are wondering because you are not sure what are our policy, > Eli> then you should know we don't have one. Some people merge, others > Eli> rebase, still others do a mix. So it's up to you, I think. > > Ok, thanks. > > Any preferences about keeping the feature branch? Should I remove it > once everything is in? I think feature branches are removed once the feature lands on master, yes. > I am somewhat inclined to pursue the approach I mentioned earlier: make > a new branch, run the renaming commands there, then cherry-pick the rest > of the bignum changes on top. Then, the final branch could be merged to > master. This would avoid a messy merge from trunk to the branch and > then back. That'd be fine. > I could either push a new branch or push -f to the existing branch if > someone wants to do a final review. I think pushing a new branch is slightly better.