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:32:29 +0300 Message-ID: <83lg9fo0g2.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> <87wot0vukj.fsf@gmx.de> <83y3dfofse.fsf@gnu.org> <2a040900-28ad-3209-0c8d-0b07fa981ad7@cs.ucla.edu> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1533839439 13456 195.159.176.226 (9 Aug 2018 18:30:39 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Aug 2018 18:30:39 +0000 (UTC) Cc: andrewjmoreton@gmail.com, tom@tromey.com, michael.albinus@gmx.de, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 09 20:30:35 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 1fnphi-0003OM-S4 for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 20:30:34 +0200 Original-Received: from localhost ([::1]:52348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnpjp-000570-GP for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 14:32:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnpjg-00056U-7u for emacs-devel@gnu.org; Thu, 09 Aug 2018 14:32:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnpjb-0005Z8-JN for emacs-devel@gnu.org; Thu, 09 Aug 2018 14:32:36 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnpjb-0005Yx-G4; Thu, 09 Aug 2018 14:32:31 -0400 Original-Received: from [176.228.60.248] (port=4832 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fnpja-00023J-Vj; Thu, 09 Aug 2018 14:32:31 -0400 In-reply-to: <2a040900-28ad-3209-0c8d-0b07fa981ad7@cs.ucla.edu> (message from Paul Eggert on Thu, 9 Aug 2018 10:31:41 -0700) 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:228341 Archived-At: > Cc: tom@tromey.com, andrewjmoreton@gmail.com, emacs-devel@gnu.org > From: Paul Eggert > Date: Thu, 9 Aug 2018 10:31:41 -0700 > > For what it's worth, I almost always rebase rather than merge, as this makes it > easier for later maintainers to understand the changes. > > There's a tension here between maintaining metadata (that is, info about who > made a change and when and in what context), versus maintaining data (that is, > the software itself). Merging prioritizes metadata, whereas rebasing prioritizes > data. When I'm spelunking through development history I'm almost always more > interested in data, so I prefer changes to be rebased. To each their own. Here's an opposite data point: a week or so ago, a question asked on reddit required me to recall why I made a certain minor change while developing the native line numbers. Fortunately, I merged my feature branch in its entirety, and so I could still see the commit on the branch which introduced the change together with its log message which explained why I did that.