From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: minor bzr->git changes missed Date: Thu, 13 Nov 2014 21:20:01 +0200 Message-ID: <83mw7ukivy.fsf@gnu.org> References: <20141113110017.3f8bc06c@jabberwock.cb.piermont.com> <83a93vkr4u.fsf@gnu.org> <20141113113738.74f15110@jabberwock.cb.piermont.com> <8361ejkolo.fsf@gnu.org> <5464E7E0.9030502@cs.ucla.edu> <83y4rfj94o.fsf@gnu.org> <20141113124405.7621c9af@jabberwock.cb.piermont.com> <83sihnj7nj.fsf@gnu.org> <20141113131420.352771c0@jabberwock.cb.piermont.com> <83r3x7j69v.fsf@gnu.org> <20141113141127.61569156@jabberwock.cb.piermont.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1415906438 1107 80.91.229.3 (13 Nov 2014 19:20:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 19:20:38 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: "Perry E. Metzger" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 20:20:31 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XozwT-00021t-U5 for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 20:20:30 +0100 Original-Received: from localhost ([::1]:33559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XozwT-0005E3-CL for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 14:20:29 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xozw8-0005CI-Tu for emacs-devel@gnu.org; Thu, 13 Nov 2014 14:20:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xozw4-0008Dp-6B for emacs-devel@gnu.org; Thu, 13 Nov 2014 14:20:08 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:56903) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xozw3-0008AC-U7 for emacs-devel@gnu.org; Thu, 13 Nov 2014 14:20:04 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NEZ00400RLBZC00@mtaout24.012.net.il> for emacs-devel@gnu.org; Thu, 13 Nov 2014 21:12:33 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NEZ00LY0S0XLV80@mtaout24.012.net.il>; Thu, 13 Nov 2014 21:12:33 +0200 (IST) In-reply-to: <20141113141127.61569156@jabberwock.cb.piermont.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:176996 Archived-At: > Date: Thu, 13 Nov 2014 14:11:27 -0500 > From: "Perry E. Metzger" > 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.