From: Eli Zaretskii <eliz@gnu.org>
To: emacs-devel@gnu.org
Subject: Re: GnuTLS docs
Date: Mon, 09 Apr 2012 20:05:26 +0300 [thread overview]
Message-ID: <83wr5o7s4p.fsf@gnu.org> (raw)
In-Reply-To: <87fwcclua9.fsf@lifelogs.com>
> From: Ted Zlatanov <tzz@lifelogs.com>
> Date: Mon, 09 Apr 2012 12:55:10 -0400
>
> GM> Thanks for writing this. Surely there was no question that this should
> GM> go to the emacs-24 branch?
>
> I didn't want to assume it was OK and I'm not experienced at merging
> commits between Bazaar branches.
What Glenn meant is that you should have pushed to the emacs-24 branch
instead, and let it be merged to trunk at some later date, as part of
periodical merges.
But now, since you already pushed to the trunk, what should be done is
install the same changes on the branch, with a "don't merge to trunk"
comment somewhere in the commit message.
next prev parent reply other threads:[~2012-04-09 17:05 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-02 5:28 Emacs pretest 24.0.95 Chong Yidong
2012-04-02 5:38 ` Release branch plans Chong Yidong
2012-04-02 7:47 ` Glenn Morris
2012-04-02 8:08 ` Michael Albinus
2012-04-03 13:48 ` Michael Albinus
2012-04-05 12:57 ` GnuTLS docs (was: Release branch plans) Ted Zlatanov
2012-04-05 14:53 ` Eli Zaretskii
2012-04-05 17:12 ` GnuTLS docs Ted Zlatanov
2012-04-05 21:06 ` Eli Zaretskii
2012-04-05 22:32 ` Ted Zlatanov
2012-04-06 9:39 ` Eli Zaretskii
2012-04-09 1:37 ` Ted Zlatanov
2012-04-09 7:39 ` Eli Zaretskii
2012-04-09 12:25 ` Ted Zlatanov
2012-04-09 12:43 ` Eli Zaretskii
2012-04-09 13:12 ` Ted Zlatanov
2012-04-09 16:17 ` Glenn Morris
2012-04-09 16:19 ` Glenn Morris
2012-04-09 16:55 ` Ted Zlatanov
2012-04-09 17:05 ` Eli Zaretskii [this message]
2012-04-09 17:28 ` Glenn Morris
2012-04-09 18:41 ` Ted Zlatanov
2012-04-09 19:17 ` Glenn Morris
2012-04-09 19:59 ` Glenn Morris
2012-04-10 0:14 ` Ted Zlatanov
2012-04-13 0:04 ` Glenn Morris
2012-04-02 8:05 ` Release branch plans Michael Albinus
2012-04-02 8:16 ` Chong Yidong
2012-04-03 13:50 ` Michael Albinus
2012-04-04 15:36 ` Michael Albinus
2012-04-05 12:51 ` Ted Zlatanov
2012-04-05 20:18 ` auth.texi (was: Release branch plans) Michael Albinus
2012-04-05 21:23 ` Eli Zaretskii
2012-04-05 22:31 ` auth.texi Ted Zlatanov
2012-04-02 10:40 ` Release branch plans Andreas Schwab
2012-04-02 13:31 ` Chong Yidong
2012-04-02 13:40 ` Andreas Schwab
2012-04-02 13:14 ` Stefan Monnier
2012-04-03 10:53 ` Chong Yidong
2012-04-03 13:50 ` Stefan Monnier
2012-04-03 18:07 ` Eli Zaretskii
2012-04-02 17:05 ` Eli Zaretskii
2012-04-02 17:21 ` Andreas Schwab
2012-04-02 17:53 ` Eli Zaretskii
2012-04-02 18:43 ` Andreas Schwab
2012-04-02 18:58 ` Eli Zaretskii
2012-04-02 22:20 ` Glenn Morris
2012-04-02 22:43 ` Juanma Barranquero
2012-04-02 22:54 ` Andreas Schwab
2012-04-02 23:08 ` Juanma Barranquero
2012-04-02 22:44 ` Andreas Schwab
2012-04-03 1:12 ` Glenn Morris
2012-04-03 1:26 ` Glenn Morris
2012-04-03 10:00 ` Andreas Schwab
2012-04-03 18:09 ` Eli Zaretskii
2012-04-03 19:13 ` Stefan Monnier
2012-04-04 17:19 ` Eli Zaretskii
2012-04-04 17:41 ` Stefan Monnier
2012-04-04 19:03 ` Eli Zaretskii
2012-04-04 22:01 ` Stefan Monnier
2012-04-05 3:04 ` Eli Zaretskii
2012-04-05 13:17 ` Stefan Monnier
2012-04-05 14:58 ` Eli Zaretskii
2012-04-05 15:44 ` Stefan Monnier
2012-04-05 15:58 ` Eli Zaretskii
2012-04-05 15:02 ` Eli Zaretskii
2012-04-03 13:45 ` Stefan Monnier
2012-04-04 17:15 ` Eli Zaretskii
2012-04-02 20:16 ` Stefan Monnier
2012-04-07 2:37 ` Glenn Morris
2012-04-02 19:03 ` Emacs pretest 24.0.95 Glenn Morris
2012-04-02 20:20 ` Glenn Morris
2012-04-02 20:28 ` Tags in Emacs repository [was Re: Emacs pretest 24.0.95] Glenn Morris
2012-04-02 20:44 ` Tags in Emacs repository Glenn Morris
2012-04-02 20:47 ` Tags in Emacs repository [was Re: Emacs pretest 24.0.95] Andreas Schwab
2012-04-02 22:31 ` Tags in Emacs repository Glenn Morris
2012-04-03 13:56 ` Stefan Monnier
2012-04-03 20:04 ` Glenn Morris
2012-04-04 1:48 ` Glenn Morris
2012-04-04 1:59 ` Glenn Morris
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=83wr5o7s4p.fsf@gnu.org \
--to=eliz@gnu.org \
--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).