From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 16:11:27 -0700 Message-ID: References: <56FE1882.9030904@cs.ucla.edu> <20160403120300.GB3537@acm.fritz.box> <8760vy6gfi.fsf@Rainer.invalid> <871t6m5zjq.fsf@Rainer.invalid> <87wpoey1ij.fsf@linux-m68k.org> <570176DF.1060207@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459725582 18832 80.91.229.3 (3 Apr 2016 23:19:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 23:19:42 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 04 01:19:35 2016 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 1amrIs-0002aW-Vp for ged-emacs-devel@m.gmane.org; Mon, 04 Apr 2016 01:19:35 +0200 Original-Received: from localhost ([::1]:55596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amrIs-0002TB-3V for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 19:19:34 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amrIS-0002Su-VO for emacs-devel@gnu.org; Sun, 03 Apr 2016 19:19:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amrIP-0001jz-Oo for emacs-devel@gnu.org; Sun, 03 Apr 2016 19:19:08 -0400 Original-Received: from mail-ob0-x234.google.com ([2607:f8b0:4003:c01::234]:36468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amrIP-0001jv-Jb for emacs-devel@gnu.org; Sun, 03 Apr 2016 19:19:05 -0400 Original-Received: by mail-ob0-x234.google.com with SMTP id j9so39489995obd.3 for ; Sun, 03 Apr 2016 16:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mail-followup-to:mime-version; bh=aowT5yQsdPMmFRbSK6hPwdkGPzClhKk7g3k/hK+yGS4=; b=K3IOryfuswmnhgjkQe7SoR49TdgXyyI5nQgikDENEP1YNgHt6jawa6WKUXUQlWeVl4 4h0PApEXoUT/fZEOKXoiMCt2W2PskVJx/CsIqwI2nhkU5TiplCTOqtSgNMpn87k+e/fr rnPYEj2QgWT4DinHEB3JH0qF+Hpd011sWiu6bE1IcPtUwOealSe7YPGaUQ5QUxEJCObN YoxGEeJLPJCgC5X89WquJ3bFQlSaz7W/mX+AzA09t5g5aFNs8Bkzg5L/jUCMPUnrG3sq GULH6xnYUWxzJWtnE/xsL69OKjU3avI6BY+xkmqWwksLlkJNW/IokWJxztHUB8txjF9H jVfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:in-reply-to:date:message-id :references:user-agent:mail-followup-to:mime-version; bh=aowT5yQsdPMmFRbSK6hPwdkGPzClhKk7g3k/hK+yGS4=; b=CiTgdiZju9PMWM6jt06FmJvubn7zTn1ZS7zLh2Eb3/D42T+b3iwtkvZRI+ad/r0Xxn MaVIqISQtIzDEqO3G5i0PHhbNZ90m6kpQaETPxj4ky2zcrSOk1GmsoJ9XZV7r26fWuCb e73LbI3mHLO0UcPuzOJqZggFS2tTWNwQ00U2VjozNj7Hz7Y9hMoZuxo2iQAi6UlOsvJB 3Dc+lf730e8A9WWtS5LUcMcudhKL07JLbfzhP9mvdsHKZZNiS9aRZVK2lGDSbI/GKtq8 sMCQnmQd7qbUsVm/AY8VkGz8cUK7btKYwgUGP+Y0e35RI7/1MlehgQopHgZVunRk5QhB wHtQ== X-Gm-Message-State: AD7BkJL3HLk5te86jemSh3XM98GRBLgOqcRRCSGCpc3rJpiY9bxBlUUV2NkqT+IcSuIOdw== X-Received: by 10.60.138.9 with SMTP id qm9mr2629978oeb.80.1459725545031; Sun, 03 Apr 2016 16:19:05 -0700 (PDT) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id cq5sm7485869oeb.10.2016.04.03.16.19.03 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 03 Apr 2016 16:19:04 -0700 (PDT) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 2C7B813DAE512; Sun, 3 Apr 2016 16:19:03 -0700 (PDT) In-Reply-To: <570176DF.1060207@cs.ucla.edu> (Paul Eggert's message of "Sun, 3 Apr 2016 13:02:39 -0700") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.1.50 (darwin) Mail-Followup-To: Paul Eggert , Andreas Schwab , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c01::234 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:202655 Archived-At: >>>>> Paul Eggert writes: > Rebasing makes sense for Alan's use case. He was working on the fix anyway, > so retesting was not that big a deal for him. Conversely, he's more of an > Emacs expert than a Git expert and merge conflicts are more of an hassle for > him. This particular case did not benefit much from the advantages of > merging over rebasing; quite the contrary. I agree that when working on a focused change, like a bug fix, that rebasing is much more preferable, as it avoids these unnecessary merge commits. However, we can't reasonably make this a requirement, because Git makes it very different to "get things right", nor do you always want rebasing if your feature work is longer than an easily retested commit-or-two. -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2