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: EWW bugs should be fixed on emacs-25 branch Date: Fri, 25 Dec 2015 09:23:44 -0800 Message-ID: References: <8337urm0cv.fsf@gnu.org> <83ziwzkl50.fsf@gnu.org> <87lh8jvsqh.fsf@fencepost.gnu.org> <83si2qliho.fsf@gnu.org> <83d1tulaa1.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1451064250 25480 80.91.229.3 (25 Dec 2015 17:24:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Dec 2015 17:24:10 +0000 (UTC) Cc: larsi@gnus.org, dak@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 25 18:24:02 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 1aCW5w-0002w8-Sr for ged-emacs-devel@m.gmane.org; Fri, 25 Dec 2015 18:24:01 +0100 Original-Received: from localhost ([::1]:35968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCW5w-00083M-7B for ged-emacs-devel@m.gmane.org; Fri, 25 Dec 2015 12:24:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCW5s-00083E-9S for emacs-devel@gnu.org; Fri, 25 Dec 2015 12:23:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aCW5r-0000cr-BI for emacs-devel@gnu.org; Fri, 25 Dec 2015 12:23:56 -0500 Original-Received: from mail-pa0-x235.google.com ([2607:f8b0:400e:c03::235]:34200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCW5k-0000cH-To; Fri, 25 Dec 2015 12:23:49 -0500 Original-Received: by mail-pa0-x235.google.com with SMTP id uo6so57445858pac.1; Fri, 25 Dec 2015 09:23:48 -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:mail-followup-to:mime-version:content-type :content-transfer-encoding; bh=fJpGKTAuy3FuTEuk9IQhKEvdNOnxCz7riCHQBB4ESqg=; b=sPPqzaXaPj6qxd847btdkHt9gauNGzHIB6yqG60/KIHygjFNxF4u2Z+KaAoEPIQ1R6 SFnmnIzDY0jHKLyAQJdwXqTQ4WDsF5HVWn6AfAASWXBLBfTsA2+frFx84JcxwUoAqEqf 1bq1e7CA55qwOV/0g3vNxBJro0cb3zOHDHqn98j0M8iVC95bSMSa6BFbwE9c5F0TA775 gzSjrGkYCrpIzFAn+hH8Ou0HHBcMxjO0I7taJLonspfbw2CASvA4of1jiaHnS3kCeYKj INJjSxzRSKzbvmgK5xqPeliO5NSaST2oEx42GyqCs/d+1LbNJt23G7Ew8PE782Rq+GeZ 8wRA== X-Received: by 10.66.251.226 with SMTP id zn2mr60098888pac.44.1451064228142; Fri, 25 Dec 2015 09:23:48 -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 k65sm60765021pfj.57.2015.12.25.09.23.46 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Dec 2015 09:23:46 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id E283511B07624; Fri, 25 Dec 2015 09:23:45 -0800 (PST) In-Reply-To: <83d1tulaa1.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 25 Dec 2015 19:15:34 +0200") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: Eli Zaretskii , dak@gnu.org, larsi@gnus.org, 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::235 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:196838 Archived-At: >>>>> Eli Zaretskii writes: >> In general, Git handles "not duplicating work you've cherry-picked into a >> branch" quite well. > 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. "git cherry can compare a branch with its upstream branch and find which commits have been upstreamed and which haven=E2=80=99t. This command is p= articularly clever because, thanks to git patch-id, it can correctly spot when a comm= it 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= /) So the theory is, you _should_ be able to cherry pick commits from one bran= ch to another, and then act as though it never happened with respect to mergin= g. --=20 John Wiegley GPG fingerprint =3D 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2