From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: EWW bugs should be fixed on emacs-25 branch Date: Fri, 25 Dec 2015 21:41:08 +0200 Message-ID: <838u4il3jf.fsf@gnu.org> References: <8337urm0cv.fsf@gnu.org> <83ziwzkl50.fsf@gnu.org> <87lh8jvsqh.fsf@fencepost.gnu.org> <83si2qliho.fsf@gnu.org> <83d1tulaa1.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1451072453 7324 80.91.229.3 (25 Dec 2015 19:40:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Dec 2015 19:40:53 +0000 (UTC) Cc: larsi@gnus.org, dak@gnu.org, emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 25 20:40:45 2015 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 1aCYEH-0002GS-6b for ged-emacs-devel@m.gmane.org; Fri, 25 Dec 2015 20:40:45 +0100 Original-Received: from localhost ([::1]:36249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCYEG-00062a-KT for ged-emacs-devel@m.gmane.org; Fri, 25 Dec 2015 14:40:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCYE0-00062G-RW for emacs-devel@gnu.org; Fri, 25 Dec 2015 14:40:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aCYDx-0008V8-L7 for emacs-devel@gnu.org; Fri, 25 Dec 2015 14:40:28 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCYDx-0008V4-HQ; Fri, 25 Dec 2015 14:40:25 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3979 helo=HOME-C4E4A596F7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aCYDw-0000va-JL; Fri, 25 Dec 2015 14:40:25 -0500 In-reply-to: (message from John Wiegley on Fri, 25 Dec 2015 09:23:44 -0800) 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.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:196854 Archived-At: > From: John Wiegley > Cc: dak@gnu.org, larsi@gnus.org, emacs-devel@gnu.org > Date: Fri, 25 Dec 2015 09:23:44 -0800 > > > AFAIK, Git doesn't track cherry-picks in the DAG. > > What it does track are "patch ids", that is, the SHA of the diff represented > by a given commit against its parent: > > https://www.kernel.org/pub/software/scm/git/docs/git-patch-id.html > > This allows the merging algorithm to know whether it's attempting to bring in > a change that has already been seen on the target branch. Since what Git version? > "git cherry can compare a branch with its upstream branch and find which > commits have been upstreamed and which haven’t. This command is particularly > clever because, thanks to git patch-id, it can correctly spot when a commit > has been upstreamed, even when the upstreaming process resulted in changes > to the commit message, line numbers, or whitespace." > > (from http://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/) How does "git cherry" enter the picture? We were talking about cherry-pick and merge commands.