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: Sun, 12 Dec 2010 22:26:17 +0200 Message-ID: <83hbeiu49i.fsf@gnu.org> References: <87r5dsd6nw.fsf@red-bean.com> <87hbejc4ir.fsf@red-bean.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1292187194 11557 80.91.229.12 (12 Dec 2010 20:53:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 12 Dec 2010 20:53:14 +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 21:53:10 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 1PRsur-0008PW-Gc for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Dec 2010 21:53:09 +0100 Original-Received: from localhost ([127.0.0.1]:54555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRsuq-00085u-Ss for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Dec 2010 15:53:08 -0500 Original-Received: from [140.186.70.92] (port=33441 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRsuH-0007lI-CX for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 15:52:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PRsuF-0005ca-NW for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 15:52:33 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PRsuF-0005cT-Lv for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2010 15:52:31 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PRsPm-0001lJ-8n; Sun, 12 Dec 2010 15:21: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 20:21: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.12921852126712 (code B ref 7548); Sun, 12 Dec 2010 20:21:02 +0000 Original-Received: (at 7548) by debbugs.gnu.org; 12 Dec 2010 20:20:12 +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 1PRsOx-0001kA-Ek for submit@debbugs.gnu.org; Sun, 12 Dec 2010 15:20:11 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PRsOu-0001jg-K0 for 7548@debbugs.gnu.org; Sun, 12 Dec 2010 15:20:09 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0LDC003000JAH500@a-mtaout21.012.net.il> for 7548@debbugs.gnu.org; Sun, 12 Dec 2010 22:26:03 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.142.197]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LDC003S40RD2590@a-mtaout21.012.net.il>; Sun, 12 Dec 2010 22:26:03 +0200 (IST) In-reply-to: <87hbejc4ir.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 15:21: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:42455 Archived-At: > From: Karl Fogel > Date: Sun, 12 Dec 2010 11:58:04 -0500 > Cc: 7548@debbugs.gnu.org, Chong Yidong > > Leo 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