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: Tue, 22 Mar 2016 12:21:10 -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> <8360wf5gmz.fsf@gnu.org> <83wpou4hb4.fsf@gnu.org> <874mbyjvlq.fsf@russet.org.uk> <83lh5a4bh1.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458674531 6045 80.91.229.3 (22 Mar 2016 19:22:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 19:22:11 +0000 (UTC) Cc: rudalics@gmx.at, eggert@cs.ucla.edu, emacs-devel@gnu.org, Phillip Lord To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 20:22:03 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 1aiRsM-0001AM-U9 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 20:21:59 +0100 Original-Received: from localhost ([::1]:39154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiRsM-0001cC-A5 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 15:21:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiRrm-0000kU-KT for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:21:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiRrl-0007AY-Li for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:21:22 -0400 Original-Received: from mail-pf0-x22e.google.com ([2607:f8b0:400e:c00::22e]:35843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiRrh-000794-Q9; Tue, 22 Mar 2016 15:21:17 -0400 Original-Received: by mail-pf0-x22e.google.com with SMTP id u190so324468898pfb.3; Tue, 22 Mar 2016 12:21:17 -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=XhSx9HfGap45hN+BcEfwwRqhfklWKWowjGbYamuyuiA=; b=0Yp7KOT9I3JIKgsKHjKS3GzOc2dmmzkZvPxyu23S5X4iTYUHn5SdamdRQ8wsMGo3QZ 2iQED1hg6mITitwzJQAayGEfzTZ2ayVbv399l9e4akTXNnz4arU2b40gn64AR25byRbz o6tE2kDeog5gxg0V0U11uXvqo00jGE2p79F8cVUQiJJ04zpTf2i546s6PYxOimFHMqh7 negiiRJ6tiN2RY/3Ec1ThbzHXr9k652re7nryDLZnom/vhALlM2a1wWiToM2wF9Wk0ZG aNc1zwPLUL22e4e9EaGoh31KRXiue3f/T+3ps8iAF+ksUKpZ38Ky8urWJ0/S7GpYTxOS mnnw== 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=XhSx9HfGap45hN+BcEfwwRqhfklWKWowjGbYamuyuiA=; b=VB7ewbpsbYvIHEGTzPow8hcJAnM+TGp7Fve4Ry0uonZIzFo9weSPIbwasn7GrxGBh+ BLUVjKdpnKac9BrD66JL6dmDaKouf/5NCCAf+HdvJ1oL8vo8zUS7jaHoQ/XArE/eaQAZ xeT7abgJLuMskL9vbjdm/nINfUTcdzUUTUu5Gstsn7v2Dca14vA1Emv43mBYfy34Z2vX b4LuvgEl8htAe4Q0tvZ2Ky762HxjYDTF6bVTkw49jwZLQ6tp44jNYLu0gjDXKy5tGs74 wU+JEOmrHnjt9usuZABeAfH9IcXxVGcyKCaFMg4FQg0+vWY98cJKRt0ITXuxyiJ3Q2Cj zgmg== X-Gm-Message-State: AD7BkJLmy570OMPjDeZx5BAVxVNahPmmwUnpKYVcuzW9I70oTfrQiTzlHIZSJ0Gw+LJE2w== X-Received: by 10.66.244.15 with SMTP id xc15mr55927192pac.97.1458674476743; Tue, 22 Mar 2016 12:21:16 -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 85sm50130541pfl.18.2016.03.22.12.21.14 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 22 Mar 2016 12:21:15 -0700 (PDT) X-Google-Original-From: John Wiegley Original-Received: by Vulcan.local (Postfix, from userid 501) id 2EBD71390522C; Tue, 22 Mar 2016 12:21:14 -0700 (PDT) In-Reply-To: <83lh5a4bh1.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 22 Mar 2016 20:24:42 +0200") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.0.92 (darwin) Mail-Followup-To: Eli Zaretskii , phillip.lord@russet.org.uk (Phillip Lord), rudalics@gmx.at, eggert@cs.ucla.edu, 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::22e 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:202094 Archived-At: >>>>> Eli Zaretskii writes: > It's not your fault. Quite a few others (myself included) produce these > merge-commits from time to time, this cannot be avoided. The problem is in > the merge procedure from emacs-25 to master -- it shouldn't skip such > merge-commits. One take away from this is to be very cautious in assessing whether merge commits should really be skipped or not. What is the criteria for knowing when they *should* be skipped? Checking to ensure that all those commits are already on master? -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2