From: Eli Zaretskii <eliz@gnu.org>
To: Christoph <cschol2112@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: Merging changes from emacs-24 to master
Date: Sun, 16 Nov 2014 05:38:44 +0200 [thread overview]
Message-ID: <83mw7rerwb.fsf@gnu.org> (raw)
In-Reply-To: <CAOrdkqNHCeC32BP+c8rfHQpXX0+mXdGsBQLbgQen0ouVs7gWVg@mail.gmail.com>
> Date: Sat, 15 Nov 2014 14:18:34 -0700
> From: Christoph <cschol2112@gmail.com>
>
> I just added rev b6cd03a to the emacs-24 branch (adding a file to .gitignore).
> The same issue needs to be fixed in master. What is the procedure to get the
> change from emacs-24 to master? Just cherry-pick the change? What about the
> Changelog? Is it expected to be merged in also? Or will there be a periodic
> bulk merge from emacs-24 to master?
There's no procedure yet. When there will be, it will be based on
merges, like with bzr.
next prev parent reply other threads:[~2014-11-16 3:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-15 21:18 Merging changes from emacs-24 to master Christoph
2014-11-16 3:38 ` Eli Zaretskii [this message]
2014-11-22 10:00 ` Steinar Bang
2014-11-16 3:58 ` Stefan Monnier
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=83mw7rerwb.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=cschol2112@gmail.com \
--cc=emacs-devel@gnu.org \
/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).