From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.devel Subject: Re: bignum branch Date: Thu, 09 Aug 2018 10:34:59 -0600 Message-ID: <87y3df7b2k.fsf@tromey.com> 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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1533832440 24614 195.159.176.226 (9 Aug 2018 16:34:00 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Aug 2018 16:34:00 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.50 (gnu/linux) Cc: Tom Tromey , andrewjmoreton@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 09 18:33:56 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 1fnnsp-0006H7-5Q for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 18:33:55 +0200 Original-Received: from localhost ([::1]:51929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnnuv-0006Hd-Oh for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 12:36:05 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnnuD-0006HM-4g for emacs-devel@gnu.org; Thu, 09 Aug 2018 12:35:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnnu8-00009D-VQ for emacs-devel@gnu.org; Thu, 09 Aug 2018 12:35:20 -0400 Original-Received: from gateway30.websitewelcome.com ([192.185.196.18]:15837) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnnu8-000081-Ld for emacs-devel@gnu.org; Thu, 09 Aug 2018 12:35:16 -0400 Original-Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 9155B11168 for ; Thu, 9 Aug 2018 11:35:14 -0500 (CDT) Original-Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id nntsfXNDoPvAdnnu0fYOCm; Thu, 09 Aug 2018 11:35:14 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dba7A1jZLpoS/MbwIay3qx7Y/FQHYgMPBYW4q7fwDds=; b=sZJtMI96g7paectHsbU1ptoald QBKaTdx4NiemwPrtkgM0DR6q1MxC+j1gEgEe3MxpoWgVisLlymsUlJ64Dzv2z/5FRXM5d1OBtxdKH 0tOYzkyHrDngm0FSpPtmsOhQ4; Original-Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:60876 helo=pokyo) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fnnts-001pcG-KF; Thu, 09 Aug 2018 11:35:00 -0500 X-Attribution: Tom In-Reply-To: <837el0p8u5.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 09 Aug 2018 05:33:38 +0300") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.85.72 X-Source-L: No X-Exim-ID: 1fnnts-001pcG-KF X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-85-72.hlrn.qwest.net (pokyo) [75.166.85.72]:60876 X-Source-Auth: tom+tromey.com X-Email-Count: 12 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 192.185.196.18 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:228335 Archived-At: >>>>> "Eli" == Eli Zaretskii writes: >> From: Tom Tromey >> Date: Wed, 08 Aug 2018 17:14:25 -0600 >> Cc: emacs-devel@gnu.org >> >> Still wondering about git merge -vs- git rebase for this branch. 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 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. Perhaps if the lisp-misc removal goes in earlier a bit more work will be required in here. I could either push a new branch or push -f to the existing branch if someone wants to do a final review. Tom