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: Missing changes in merges from emacs-25 to master Date: Mon, 21 Mar 2016 14:27:54 -0700 Message-ID: References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <83zitr6civ.fsf@gnu.org> <83lh5b66jj.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458595706 23013 80.91.229.3 (21 Mar 2016 21:28:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Mar 2016 21:28:26 +0000 (UTC) Cc: rudalics@gmx.at, eggert@cs.ucla.edu, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 21 22:28:19 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 1ai7N4-0000ax-S9 for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 22:28:18 +0100 Original-Received: from localhost ([::1]:60580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai7N4-0007ZW-6a for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 17:28:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai7Mp-0007Yl-Mf for emacs-devel@gnu.org; Mon, 21 Mar 2016 17:28:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai7Mo-0005KE-NF for emacs-devel@gnu.org; Mon, 21 Mar 2016 17:28:03 -0400 Original-Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]:34095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai7Mk-0005Jb-R4; Mon, 21 Mar 2016 17:27:58 -0400 Original-Received: by mail-pf0-x22f.google.com with SMTP id x3so279558754pfb.1; Mon, 21 Mar 2016 14:27:58 -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=frV7D3KcbDDVVuEWKTdqU7sD0Aw/ZPykvo9lv/1ZB1U=; b=WQi6dqe01Je1JCxECgQObY8w6v7kxNJ2qCni9yPxQoFsmGp6tgzknA+0maf4pPy2Su 3AuY5WVFrFlF+K03elRoQGbKMcIwaSM83Kfa1KSBAtnhlFHojZ16lKL6u9aKRFIlpyA6 /UHoZV9Y5ZBwX3cajQfNrJi6C0F7quojgczaN9rArfgmGHrNE82v09mK/iv9/JEoCC9o V2FXm1GkTBZ1UlghdHtblbCd31hjOFOBxzdr1M4ssbQg8JSJbS5P538z46gF0qYCsB66 uXhowz7emboKGnDeKPqCHmqRLCK8NCcW1h9qeEipr6QbFi/NAcS6/P33lLTLKJd66XLO W3Pw== 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=frV7D3KcbDDVVuEWKTdqU7sD0Aw/ZPykvo9lv/1ZB1U=; b=Sqeh12Hxu0jrxOmMLdVXolZ93NONDB8e9uJDFSugXUv+kk8gIUhkFyZ0Uoq0NTX0Y+ AhI2siWaNStJbEOveM6oNgR5Rk+6SyEj0acxK5X5mY0aK7w7N9N8bdRv5Dy9K6inTx6U +1QTBxaxt1I0h0dLlD5Aq1Vp/SxUG1vrG2Uwisa7mbtePUeWLnk3EAzIy2VaTAGNSs// TeNQ21bUXEXppRx5ZJGFUH6xbVpWDK6xEVdLfOmD1oDyBaiV6me6X3taVFUw7JqOqcee hCTkc3XNumAOMHIgt2EvD/egdx/wWo8kGzaqHR4MT5YzvN8DTr2O6sA3yftBlRfSTyaT RAGA== X-Gm-Message-State: AD7BkJIwzVGkcaPq8vgDp8aAfK2AJmBfr1qG9EWiG1I2ByQWMkJZqNe0a0PaFLyruSbC/A== X-Received: by 10.66.66.42 with SMTP id c10mr20078028pat.119.1458595678068; Mon, 21 Mar 2016 14:27:58 -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 y7sm36847339pfa.82.2016.03.21.14.27.56 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 21 Mar 2016 14:27:57 -0700 (PDT) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 417E8138EA852; Mon, 21 Mar 2016 14:27:56 -0700 (PDT) In-Reply-To: <83lh5b66jj.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 21 Mar 2016 20:16:00 +0200") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.0.92 (darwin) Mail-Followup-To: Eli Zaretskii , eggert@cs.ucla.edu, rudalics@gmx.at, 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:400e:c00::22f 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:202039 Archived-At: >>>>> Eli Zaretskii writes: > Sorry, I'm not following: the above will just show the diffs between the > branches. I asked about the reason(s) for the omission of some commits from > the merge. How will "git diff" satisfy that request? As for "reason for the omission", I think there are two possible answers: 1. gitmerge.el auto-marked it to be skipped, and despite my examination of each such mark, I failed to see that should not be skipped. 2. I incorrectly resolved a merge conflict that seemed simple enough to me that I didn't e-mail the author of the commit about it. So, in both case, human error pointed at me. If there's a tool error here, I'd be surprised. -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2