From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#7548: [FIXED] bookmark-default-handler wrong documentation Date: Mon, 13 Dec 2010 00:31:58 +0200 Message-ID: <83bp4qipwh.fsf@gnu.org> References: <87r5dsd6nw.fsf@red-bean.com> <87hbejc4ir.fsf@red-bean.com> <83hbeiu49i.fsf@gnu.org> <87y67ubtwh.fsf@red-bean.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1292194363 7941 80.91.229.12 (12 Dec 2010 22:52:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 12 Dec 2010 22:52:43 +0000 (UTC) Cc: cyd@stupidchicken.com, 7548@debbugs.gnu.org, sdl.web@gmail.com To: Karl Fogel Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 12 23:52:35 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PRumQ-00027i-Fa for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Dec 2010 23:52:34 +0100 Original-Received: from localhost ([127.0.0.1]:45845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRumP-0002Xs-UI for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Dec 2010 17:52:34 -0500 Original-Received: from [140.186.70.92] (port=48463 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRumL-0002XY-5K for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 17:52:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PRumJ-0001zt-Rn for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 17:52:28 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PRumJ-0001zh-Mg for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 17:52:27 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PRuMk-0006Wi-9N; Sun, 12 Dec 2010 17:26:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 12 Dec 2010 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 7548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 7548-submit@debbugs.gnu.org id=B7548.129219273725052 (code B ref 7548); Sun, 12 Dec 2010 22:26:02 +0000 Original-Received: (at 7548) by debbugs.gnu.org; 12 Dec 2010 22:25:37 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PRuML-0006W0-33 for submit@debbugs.gnu.org; Sun, 12 Dec 2010 17:25:37 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PRuMI-0006Vq-Jx for 7548@debbugs.gnu.org; Sun, 12 Dec 2010 17:25:35 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0LDC000005T44F00@a-mtaout22.012.net.il> for 7548@debbugs.gnu.org; Mon, 13 Dec 2010 00:31:43 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.142.197]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LDC00MQC6KTAPA0@a-mtaout22.012.net.il>; Mon, 13 Dec 2010 00:31:43 +0200 (IST) In-reply-to: <87y67ubtwh.fsf@red-bean.com> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 12 Dec 2010 17:26:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:42463 Archived-At: > From: Karl Fogel > Cc: sdl.web@gmail.com, 7548@debbugs.gnu.org, cyd@stupidchicken.com > Date: Sun, 12 Dec 2010 15:47:26 -0500 > > Eli Zaretskii 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.