From: Karl Fogel <kfogel@red-bean.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Wrong commit message. What to do now?
Date: Wed, 14 Jul 2010 11:29:15 -0400 [thread overview]
Message-ID: <87pqyqaxpw.fsf@kslab.red-bean.com> (raw)
In-Reply-To: <831vb6shit.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 14 Jul 2010 09:29:30 +0300")
Eli Zaretskii <eliz@gnu.org> writes:
>> Also, I had forgotten: are we not supposed to be committing to trunk
>> right now?
>
>Why not? There's no branch or feature freeze anywhere in sight.
That's what I don't know how to tell -- where do I look to see what's
"in sight"?
In my previous mail, I listed the places I looked. But in the past,
when there *has* been a feature freeze, I'm pretty sure those places
also did not say anything special.
>If you commit a safe bugfix for a problem that exists in Emacs 23.2,
>consider committing to the emacs-23 branch, not to the trunk; it will
>get merged with the trunk later. And there's a request from Stefan
>and Yidong to commit either to the trunk or to emacs-23, but not to
>both. This is to make the merges from emacs-23 to the trunk a bit
>less painful. That's all, there are no other rules. How's that too
>complicated, I don't see.
Oh, I wasn't saying that's too complicated. What I was saying is that I
didn't know how to *find* those rules (and therefore, before this
moment, didn't know them).
Now that you've stated them explicitly, I can refer to your mail. I'd
been looking for them in places more permanent than the mail archive and
not finding them, that's all.
And for those of us who have only a little room left in our heads, we
can just remember "push only to trunk, always" if nothing else :-).
Thanks for laying it out clearly.
-Karl
prev parent reply other threads:[~2010-07-14 15:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-13 22:16 Wrong commit message. What to do now? Karl Fogel
2010-07-13 22:43 ` Óscar Fuentes
2010-07-13 23:17 ` Karl Fogel
2010-07-13 23:33 ` Óscar Fuentes
[not found] ` <871vb6dhm7.fsf@red-bean.com>
2010-07-14 0:54 ` Óscar Fuentes
2010-07-26 22:49 ` Stefan Monnier
2010-07-14 3:23 ` Stephen J. Turnbull
2010-07-14 3:42 ` Karl Fogel
2010-07-14 6:29 ` Eli Zaretskii
2010-07-14 15:29 ` Karl Fogel [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pqyqaxpw.fsf@kslab.red-bean.com \
--to=kfogel@red-bean.com \
--cc=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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.