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: master 70f3e4e 08/15: ; Merge from origin/emacs-25 Date: Tue, 12 Jan 2016 09:03:27 -0800 Message-ID: References: <20160112070839.6841.77764@vcs.savannah.gnu.org> <0mlh7u7nds.fsf@fencepost.gnu.org> Reply-To: John Wiegley NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452618230 21894 80.91.229.3 (12 Jan 2016 17:03:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Jan 2016 17:03:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 12 18:03:43 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 1aJ2MA-00018B-Js for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 18:03:42 +0100 Original-Received: from localhost ([::1]:33247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2MA-0006Vl-4l for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 12:03:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2M5-0006Sz-L1 for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:03:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJ2M1-0006zB-41 for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:03:37 -0500 Original-Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]:35793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2M0-0006yt-V7; Tue, 12 Jan 2016 12:03:33 -0500 Original-Received: by mail-pa0-x232.google.com with SMTP id ho8so81812590pac.2; Tue, 12 Jan 2016 09:03:32 -0800 (PST) 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:reply-to:mail-followup-to:mime-version:content-type; bh=PQBOGLrOI+ddQJmINa9kXa/pKV6lC4kO2ls9l5JTAko=; b=zYr87o5TDRS5gCezJBSHOuxhaHZrH5GvzayEt1fOspZWMr1f4n9feHFxp4rKfIrwVH o6N8lXr4i3/v5sbZSdA3sWLVPH2cPnD/BqtAMa3PzyJGdMO6H7VdxDzuiiIn2TYXSDdD iC0904BZ7kDUmdGj4iMvLdAug+W+ZsqyQxSkIVnArBH2z369zkjm03hN9ARY35EqCpaQ RTtK+0OJmIBHFvmBfhbCkymf9nRDssatnxDNwZiqD/DE3rDPcD8fjXfcV10xnlNqXtud CkPtRp3Xp7yU0xACDHzBR9qOqyP4FXOxrUGMuwQPQ9vRHgmMLQyawgT6WFbgDDjF5HzO BHTw== 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:reply-to:mail-followup-to:mime-version :content-type; bh=PQBOGLrOI+ddQJmINa9kXa/pKV6lC4kO2ls9l5JTAko=; b=CUlmMlkcgVgZbp1iMHgqxDuyssGHelg6rRs0CP9uOMWi7/ncf+E4spGwqFpmYJOf2J MvXeyY28j9b8Bj75FFz1Jkt6ELvZuv9Y0IwtD8tS6sP89mOJrRgJ4A+HciswSijXEIPe ZFG+nt++WEmcRYlni9OVu7gVVsqN0Y0dcQAMcUYwUJrXmSXfM23lkZZhClPUf+ezEj3s yOb1cygGYBV7+D2YZIpEqOQ562gk0uS884KRYqSUjgO4rxsBeFGJSyrQlxuAVvKpIhqp ZHMlgLx4o0TKoyU+GZ8MdH3/ATQt2W8Wao9bPqkEVNUs86lwPNAtYrwI9gZDnbjrHKy8 qBLQ== X-Gm-Message-State: ALoCoQm7A/fypAxACBAuNnS8hPFlkUF7VWAquUWze58YEFoqYZeJ3jFcbOhUvYrgFIutpp+FMZlXE5iqFbb/3NoK0zI7RrXNrA== X-Received: by 10.66.149.7 with SMTP id tw7mr65099536pab.72.1452618212128; Tue, 12 Jan 2016 09:03:32 -0800 (PST) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id wa17sm125651218pac.38.2016.01.12.09.03.31 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Jan 2016 09:03:31 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 9D6DD123BD6FD; Tue, 12 Jan 2016 09:03:30 -0800 (PST) In-Reply-To: <0mlh7u7nds.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue, 12 Jan 2016 11:50:39 -0500") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: Glenn Morris , 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:c03::232 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:198088 Archived-At: >>>>> Glenn Morris writes: > In general, almost every non-trivial "skip" in this merge looks wrong to me. I accepted the skips from gitmerge. Looks like that is not the right thing to do after all. What is the right way to cherry-pick over the skipped commits that shouldn't have been? -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2