From: Eli Zaretskii <eliz@gnu.org>
To: Stefan <monnier@iro.umontreal.ca>
Cc: ofv@wanadoo.es, emacs-devel@gnu.org
Subject: Re: State of the repository conversion
Date: Thu, 20 Mar 2014 18:19:56 +0200 [thread overview]
Message-ID: <83a9ck970z.fsf@gnu.org> (raw)
In-Reply-To: <jwvr45xv53s.fsf-monnier+emacs@gnu.org>
> From: Stefan <monnier@iro.umontreal.ca>
> Date: Thu, 20 Mar 2014 00:59:57 -0400
> Cc: emacs-devel@gnu.org
>
> > Which reminds me of a comment I made long time ago: applying fixes on
> > the maintenance branch and then cherry-picking them into the development
>
> Not sure why this matters: we don't cherry pick from the
> maintenance branch. Instead we merge the development branch. And we
> sometimes cherry pick fixes from the development branch into the
> maintenance branch (which makes the subsequent merge a bit more
> delicate, since we want to avoid applying that change twice).
See my other mail: why not install changes on the trunk, and then
cherry-pick some of them to the release branch?
next prev parent reply other threads:[~2014-03-20 16:19 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-19 17:51 State of the repository conversion Eric S. Raymond
2014-03-19 18:14 ` Paul Eggert
2014-03-19 18:31 ` Eli Zaretskii
2014-03-19 18:54 ` Eric S. Raymond
2014-03-19 19:17 ` Eli Zaretskii
2014-03-20 0:08 ` Stephen J. Turnbull
2014-03-20 0:32 ` Eric S. Raymond
2014-03-20 1:01 ` Óscar Fuentes
2014-03-20 3:55 ` Eli Zaretskii
2014-03-20 4:09 ` Óscar Fuentes
2014-03-20 7:06 ` David Engster
2014-03-20 7:49 ` Steinar Bang
2014-03-20 16:35 ` Eli Zaretskii
2014-03-20 12:42 ` Óscar Fuentes
2014-03-20 14:03 ` Stefan
2014-03-20 15:09 ` Óscar Fuentes
2014-03-20 16:13 ` Eli Zaretskii
2014-03-20 20:23 ` Steinar Bang
2014-03-20 4:04 ` Eli Zaretskii
2014-03-20 4:25 ` Óscar Fuentes
2014-03-20 4:59 ` Stefan
2014-03-20 7:36 ` Steinar Bang
2014-03-20 7:48 ` Florian Weimer
2014-03-20 8:07 ` Steinar Bang
2014-03-20 16:19 ` Eli Zaretskii [this message]
2014-03-20 18:02 ` Stefan
2014-03-20 18:09 ` David Kastrup
2014-03-20 20:35 ` Steinar Bang
2014-03-20 18:15 ` Eli Zaretskii
2014-03-20 18:44 ` Stefan
2014-03-20 20:17 ` Eli Zaretskii
2014-03-20 20:30 ` Steinar Bang
2014-03-20 20:39 ` Eli Zaretskii
2014-03-20 21:10 ` Steinar Bang
2014-03-21 7:46 ` Eli Zaretskii
2014-03-21 12:40 ` Stefan
2014-03-21 12:57 ` Steinar Bang
2014-03-21 16:08 ` Eli Zaretskii
2014-03-21 17:02 ` David Kastrup
2014-03-21 18:35 ` Eli Zaretskii
2014-03-21 19:01 ` David Caldwell
2014-03-20 16:17 ` Eli Zaretskii
2014-03-20 19:28 ` Óscar Fuentes
2014-03-20 20:19 ` Eli Zaretskii
2014-03-20 20:31 ` Óscar Fuentes
2014-03-20 20:40 ` Eli Zaretskii
2014-03-20 20:46 ` Óscar Fuentes
2014-03-21 3:02 ` Stephen J. Turnbull
2014-03-21 8:01 ` Eli Zaretskii
2014-03-22 7:18 ` Stefan-W. Hahn
2014-03-19 21:25 ` Andreas Schwab
2014-03-20 3:49 ` Eli Zaretskii
2014-03-20 7:46 ` Steinar Bang
2014-03-20 16:09 ` Glenn Morris
2014-03-20 20:17 ` Steinar Bang
2014-03-20 20:21 ` Eli Zaretskii
2014-03-20 16:33 ` Eli Zaretskii
2014-03-20 21:00 ` Steinar Bang
2014-03-21 9:08 ` Eli Zaretskii
2014-03-21 9:38 ` Andreas Schwab
2014-03-21 9:53 ` Steinar Bang
2014-03-21 10:17 ` Eli Zaretskii
2014-03-21 12:30 ` Steinar Bang
2014-03-20 18:19 ` Andreas Schwab
2014-03-20 18:27 ` Eli Zaretskii
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=83a9ck970z.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=ofv@wanadoo.es \
/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).