all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: "Perry E. Metzger" <perry@piermont.com>
Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org
Subject: Re: minor bzr->git changes missed
Date: Thu, 13 Nov 2014 21:20:01 +0200	[thread overview]
Message-ID: <83mw7ukivy.fsf@gnu.org> (raw)
In-Reply-To: <20141113141127.61569156@jabberwock.cb.piermont.com>

> Date: Thu, 13 Nov 2014 14:11:27 -0500
> From: "Perry E. Metzger" <perry@piermont.com>
> Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org
> 
> > > Ah. My confusion was that I thought your message asked him to
> > > commit *only* to the branch.
> > 
> > That's indeed what I said.  These changes will be later merged to
> > master, so no need to commit twice.
> 
> Out of curiosity, how is that handled? That is, when a bug is fixed
> on the branch, does one immediately merge that fix to master, or does
> that happen at some fixed interval, or does something else happen?

Some Helpful Soul (TM) does that whenever they like.

Also, sometimes people who need to make a change on master that
depends on some bugfix on the branch do the merge because they need
it.

In general, everybody with write access are encoraged to do these
merges when they have a moment.



  reply	other threads:[~2014-11-13 19:20 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-13 16:00 minor bzr->git changes missed Perry E. Metzger
2014-11-13 16:21 ` Eli Zaretskii
2014-11-13 16:37   ` Perry E. Metzger
2014-11-13 17:16     ` Eli Zaretskii
2014-11-13 17:18       ` Paul Eggert
2014-11-13 17:36         ` Eli Zaretskii
2014-11-13 17:44           ` Perry E. Metzger
2014-11-13 18:08             ` Eli Zaretskii
2014-11-13 18:14               ` Perry E. Metzger
2014-11-13 18:37                 ` Eli Zaretskii
2014-11-13 19:11                   ` Perry E. Metzger
2014-11-13 19:20                     ` Eli Zaretskii [this message]
2014-11-13 21:54               ` Lars Magne Ingebrigtsen
2014-11-14  5:42                 ` Eli Zaretskii
2014-11-14  7:10                 ` Achim Gratz
2014-11-14  7:36                   ` H. Dieter Wilhelm
2014-11-13 17:56           ` Paul Eggert
2014-11-13 18:01             ` Eli Zaretskii
2014-11-13 20:40               ` Paul Eggert
2014-11-14  5:20                 ` Eli Zaretskii
2014-11-13 17:40         ` Perry E. Metzger
2014-11-13 17:36 ` Eric S. Raymond

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=83mw7ukivy.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=eggert@cs.ucla.edu \
    --cc=emacs-devel@gnu.org \
    --cc=perry@piermont.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 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.