unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Karl Fogel <kfogel@red-bean.com>
Cc: cyd@stupidchicken.com, 7548@debbugs.gnu.org, sdl.web@gmail.com
Subject: bug#7548: [FIXED] bookmark-default-handler wrong documentation
Date: Mon, 13 Dec 2010 00:31:58 +0200	[thread overview]
Message-ID: <83bp4qipwh.fsf@gnu.org> (raw)
In-Reply-To: <87y67ubtwh.fsf@red-bean.com>

> From: Karl Fogel <kfogel@red-bean.com>
> Cc: sdl.web@gmail.com,  7548@debbugs.gnu.org,  cyd@stupidchicken.com
> Date: Sun, 12 Dec 2010 15:47:26 -0500
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> >> I generally just put things on trunk and trust they will make it into a
> >> release at some point.
> >
> >We generally do it the other way around: changes that are safe for the
> >release branch should be committed there, and they will then be merged
> >to the trunk (unless you instruct otherwise, see below).
> 
> Is this documented somewhere?

I think Stefan posted something like that here, but I cannot find it
now.

> (I think I recall having this discussion on-list before.)  If one just
> always commits to trunk, then one doesn't have to ponder whether one's
> changes are safe for the upcoming release or not -- one knows the
> changes will eventually make it into mainline releases.  Since these
> changes were about the long-term health of bookmark.el, and were not
> bugfixes intended for this particular release, committing to trunk seems
> like the better route in this case anyway.

The decision whether a particular change is important enough to have
in the next bugfix release is up to you; I just answered your
question.

> Where does a developer look in order to find out that we're currently in
> a "commit to branches not to trunk" state?

We are always in that state.  Changes that are safe for the branch
should be committed there at all times.  The branch is merged to the
trunk periodically.





  parent reply	other threads:[~2010-12-12 22:31 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-04  5:45 bug#7548: 23.2.90; bookmark-default-handler wrong documentation Leo
2010-12-05 14:14 ` Leo
2010-12-08  8:12 ` bug#7548: [FIXED] " Karl Fogel
2010-12-10  8:55   ` Leo
2010-12-12 16:58     ` Karl Fogel
2010-12-12 20:26       ` Eli Zaretskii
2010-12-12 20:47         ` Karl Fogel
2010-12-12 22:28           ` Eli Zaretskii
2010-12-12 22:31           ` Eli Zaretskii [this message]
2010-12-13  0:35           ` Glenn Morris
2010-12-13  2:56             ` Glenn Morris
2010-12-13 17:16           ` 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=83bp4qipwh.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=7548@debbugs.gnu.org \
    --cc=cyd@stupidchicken.com \
    --cc=kfogel@red-bean.com \
    --cc=sdl.web@gmail.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).