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: Sun, 12 Dec 2010 22:26:17 +0200	[thread overview]
Message-ID: <83hbeiu49i.fsf@gnu.org> (raw)
In-Reply-To: <87hbejc4ir.fsf@red-bean.com>

> From: Karl Fogel <kfogel@red-bean.com>
> Date: Sun, 12 Dec 2010 11:58:04 -0500
> Cc: 7548@debbugs.gnu.org, Chong Yidong <cyd@stupidchicken.com>
> 
> Leo <sdl.web@gmail.com> writes:
> >On 2010-12-08 08:12 +0000, Karl Fogel wrote:
> >> Thanks, Leo and Theirry.  Fixed in bzr rev 102609.  Specifically:
> >
> >I wonder if this can be moved to 23.3.
> 
> 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).

> However, if you can point me to some
> documentation about the proper way to put things on release branches

It's very simple:

 . create a clone of the "emacs-23" branch ("bzr branch --bind")
 . commit changes that are appropriate there instead of to the trunk
 . if a change committed to the branch should not be merged to the
   trunk, put some prominent verbiage into the log message
 . commit to the trunk only changes that are inappropriate for the
   release branch





  reply	other threads:[~2010-12-12 20:26 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 [this message]
2010-12-12 20:47         ` Karl Fogel
2010-12-12 22:28           ` Eli Zaretskii
2010-12-12 22:31           ` Eli Zaretskii
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=83hbeiu49i.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).