From: Drew Adams <drew.adams@oracle.com>
To: bruce.connor.am@gmail.com
Cc: Karl Fogel <kfogel@red-bean.com>, Eli Zaretskii <eliz@gnu.org>,
emacs-devel <emacs-devel@gnu.org>
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) [thread overview]
Message-ID: <cf0b47e3-5039-466f-9a94-6a8f92b8c32a@default> (raw)
In-Reply-To: <CAAdUY-JKL5Qny-wPO_8A2trAqy-TCvuZPskpdC6G7rdT0Ce3gw@mail.gmail.com>
> 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.
next prev parent reply other threads:[~2015-12-02 0:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 15:54 Char-folding: how can we implement matching multiple characters as a single "thing"? Artur Malabarba
2015-11-30 16:12 ` Paul Eggert
2015-11-30 16:49 ` Clément Pit--Claudel
2015-11-30 17:55 ` Eli Zaretskii
2015-11-30 21:48 ` John Wiegley
2015-12-01 14:18 ` Artur Malabarba
2015-12-01 15:50 ` Eli Zaretskii
2015-12-01 16:31 ` GIT mirror of Lisp dev sources [was: Char-folding: how can we implement matching...] Drew Adams
2015-12-01 16:43 ` Steinar Bang
2015-12-01 17:14 ` Drew Adams
2015-12-01 17:32 ` Artur Malabarba
2015-12-01 18:03 ` Drew Adams
2015-12-01 18:29 ` Karl Fogel
2015-12-01 18:52 ` Artur Malabarba
2015-12-01 21:18 ` Drew Adams
2015-12-01 23:37 ` Artur Malabarba
2015-12-02 0:14 ` Drew Adams [this message]
2015-12-02 0:59 ` Artur Malabarba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf0b47e3-5039-466f-9a94-6a8f92b8c32a@default \
--to=drew.adams@oracle.com \
--cc=bruce.connor.am@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kfogel@red-bean.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).