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: GnuTLS docs Date: Mon, 09 Apr 2012 20:05:26 +0300 Message-ID: <83wr5o7s4p.fsf@gnu.org> References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <87y5qa72vm.fsf_-_@lifelogs.com> <834nsycjs0.fsf@gnu.org> <87y5qa5chf.fsf@lifelogs.com> <83pqblc2ih.fsf@gnu.org> <87pqbl6c9l.fsf@lifelogs.com> <83d37lb3nu.fsf@gnu.org> <87d37hofbs.fsf@lifelogs.com> <83k41p8ibl.fsf@gnu.org> <878vi5nlbg.fsf@lifelogs.com> <834nst848o.fsf@gnu.org> <87r4vxm4l2.fsf@lifelogs.com> <1rk41oubfu.fsf@fencepost.gnu.org> <87fwcclua9.fsf@lifelogs.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1333991250 20963 80.91.229.3 (9 Apr 2012 17:07:30 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 9 Apr 2012 17:07:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 09 19:07:30 2012 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 1SHI3t-0000Wl-OU for ged-emacs-devel@m.gmane.org; Mon, 09 Apr 2012 19:07:29 +0200 Original-Received: from localhost ([::1]:34228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHI3t-0000ka-17 for ged-emacs-devel@m.gmane.org; Mon, 09 Apr 2012 13:07:29 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHI3p-0000jr-VJ for emacs-devel@gnu.org; Mon, 09 Apr 2012 13:07:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHI3n-000558-U0 for emacs-devel@gnu.org; Mon, 09 Apr 2012 13:07:25 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:60653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHI3n-00054p-FT for emacs-devel@gnu.org; Mon, 09 Apr 2012 13:07:23 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0M280090026SCY00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Mon, 09 Apr 2012 20:07:21 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.57.204]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M28008IN288YCD1@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Mon, 09 Apr 2012 20:07:21 +0300 (IDT) In-reply-to: <87fwcclua9.fsf@lifelogs.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.172 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:149526 Archived-At: > From: Ted Zlatanov > Date: Mon, 09 Apr 2012 12:55:10 -0400 > > GM> Thanks for writing this. Surely there was no question that this should > GM> go to the emacs-24 branch? > > I didn't want to assume it was OK and I'm not experienced at merging > commits between Bazaar branches. What Glenn meant is that you should have pushed to the emacs-24 branch instead, and let it be merged to trunk at some later date, as part of periodical merges. But now, since you already pushed to the trunk, what should be done is install the same changes on the branch, with a "don't merge to trunk" comment somewhere in the commit message.