From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Some proposed backports from master to emacs-25 Date: Tue, 4 Oct 2016 08:02:11 -0400 Message-ID: References: <87shseyhfl.fsf@users.sourceforge.net> <83int8oc6b.fsf@gnu.org> <87h98s38u0.fsf@engster.org> <8360p8o8fx.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1475582742 9715 195.159.176.226 (4 Oct 2016 12:05:42 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 4 Oct 2016 12:05:42 +0000 (UTC) Cc: David Engster , Emacs developers To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 04 14:05:37 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brOTO-0000hJ-TE for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 14:05:27 +0200 Original-Received: from localhost ([::1]:41965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brOTM-0008GF-B7 for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 08:05:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brOQR-0006ny-AI for emacs-devel@gnu.org; Tue, 04 Oct 2016 08:02:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brOQM-0003GO-Vt for emacs-devel@gnu.org; Tue, 04 Oct 2016 08:02:23 -0400 Original-Received: from mail-oi0-x22a.google.com ([2607:f8b0:4003:c06::22a]:36614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brOQG-0003AM-BN; Tue, 04 Oct 2016 08:02:12 -0400 Original-Received: by mail-oi0-x22a.google.com with SMTP id m72so61468981oik.3; Tue, 04 Oct 2016 05:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=diGGabru/V4qkr/+BLYkPcnkcXU0mpB3vTzw8sy7fwI=; b=T9nfUhhwicJDrHzKEzeOMlgQBPzXBd3CEEmwYLB63fWsRokSnh+sILSISHMDiI/ONt 2UmiqMTfDZ6BD3gz1feU0tYNsZYZvofWCKzMmsDE/QjGHQTh5RvqckNwx8yH+FwiCLjS xlcpn8RUdyM2ZQuF7dznLLRNBYUK/jFyKaa3wYVzQrJkaTTHlKjz181vEGACK3IVijo2 Jvun6rTGvT0Qq0VcPolxTADnZI/ZNaQ7RUkFG2/OUIqf8N7BU88vJg5kwmmycC5q36/H dFbeWYL+8k6hwFzxmGAwRe2yf+5+5MIW7RDIj830rYDS+jxSQ37ctM5yN4koy+kPB393 zewA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=diGGabru/V4qkr/+BLYkPcnkcXU0mpB3vTzw8sy7fwI=; b=A4aVqWc7M99lEbfPZk9IKH4iIPaFLHmp+t7z0EWrRR/NOvZa6y9xV40k+En8tHJKUf p/TskMlzqKwvccngVTOluaF9lldiusR0vOnq9jVkEJnKsQdywj9vkd5nJ3Sg/s/vG9Iy 3OGndqaFkxYKUIFljpHxSspf4/tN0gUzdQh3K+HD6y6UYSjwQ/s7yofPI8cNG9Ru8u6i GPyDHQVu8UOvFfezp2/+u0dE1ipQ8E1ejfwUcjqvn9feyJcbUHmu4LIy/dxHLvAhyTxp iFT0hMzd4tbknUcnOWBcLP2U5HAHkvIdPiRUf3zzqAxmmawVE/hknSQsE5ngcjemH9bi 3VFg== X-Gm-Message-State: AA6/9RlyvqJB2Gv8Tg8HvL+5MrjuDNwlF3R75fgvNg0weOBWaiwMLosdPfkhQE3a3XpQdZx94+1Z1bqF2cWH+Q== X-Received: by 10.157.34.5 with SMTP id o5mr1951758ota.37.1475582531483; Tue, 04 Oct 2016 05:02:11 -0700 (PDT) Original-Received: by 10.157.42.16 with HTTP; Tue, 4 Oct 2016 05:02:11 -0700 (PDT) In-Reply-To: <8360p8o8fx.fsf@gnu.org> X-Google-Sender-Auth: 5CtREZrztZM3n_nUnwEI9mc_fRE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::22a X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:207977 Archived-At: On Tue, Oct 4, 2016 at 3:54 AM, Eli Zaretskii wrote: >> From: David Engster >> Cc: Noam Postavsky , emacs-devel@gnu.org >> Date: Tue, 04 Oct 2016 08:51:51 +0200 >> >> > (defvar gitmerge-skip-regexp >> > ;; We used to include "sync" in there, but in my experience it only >> > ;; caused false positives. --Stef >> > "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\) merge\\|\ >> > ^^^^^^^^^^^^^^^^^^^^^^^^^ >> > re-?generate\\|bump version\\|from trunk\\|Auto-commit" >> > "Regexp matching logs of revisions that might be skipped. >> > `gitmerge-missing' will ask you if it should skip any matches.") >> >> This is only on the master branch, though. I've no idea why I didn't >> commit this to emacs-25... > > The merges are only done on master, right? Yeah, so it should be fine, except that it's potentially a bit confusing (I asked the question because I only looked at the emacs-25 branch).