From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Drew Adams Newsgroups: gmane.emacs.devel Subject: RE: GIT mirror of Lisp dev sources [was: Char-folding: how can we implement matching...] Date: Tue, 1 Dec 2015 16:14:13 -0800 (PST) Message-ID: References: <8737vm2fan.fsf@red-bean.com> <0239bc4e-2682-4d73-a8ba-c5030c9fd28e@default> 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 1449015297 8469 80.91.229.3 (2 Dec 2015 00:14:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2015 00:14:57 +0000 (UTC) Cc: Karl Fogel , Eli Zaretskii , emacs-devel To: bruce.connor.am@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 01:14: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 1a3v4E-00074R-KH for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2015 01:14:42 +0100 Original-Received: from localhost ([::1]:55452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3v4D-0002D5-Qg for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2015 19:14:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3v40-0002D0-2n for emacs-devel@gnu.org; Tue, 01 Dec 2015 19:14:28 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3v3z-0001Za-6I for emacs-devel@gnu.org; Tue, 01 Dec 2015 19:14:28 -0500 Original-Received: from userp1040.oracle.com ([156.151.31.81]:39941) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3v3v-0001XC-84; Tue, 01 Dec 2015 19:14:23 -0500 Original-Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id tB20EGKG028504 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 2 Dec 2015 00:14:16 GMT Original-Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id tB20EFko014194 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Wed, 2 Dec 2015 00:14:15 GMT Original-Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0122.oracle.com (8.13.8/8.13.8) with ESMTP id tB20EET4020369; Wed, 2 Dec 2015 00:14:14 GMT In-Reply-To: X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.9 (901082) [OL 12.0.6691.5000 (x86)] X-Source-IP: userv0022.oracle.com [156.151.31.74] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 156.151.31.81 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:195727 Archived-At: > any new features should go to the master branch, while bug fixes > and refinements should go to the emacs-25 branch (these are later > merged onto master too). It's the "later" that means that master is not necessarily up-to-date. It means that looking to master does not give you the latest developments - until sometime "later". I wouldn't think that the changes you made recently to support multiple-char folding on `emacs-25' (and that you later disabled) are just "bug fixes and refinements". They change the behavior/design, IIUC. Seems like it might have been good to sync `master' then (at least as far as that file is concerned). Anyway, I guess the answer, to how to get the latest changes, is to check a file in both `master' and `emacs-25', and pick whichever one is more recent.