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: Bzr taskbranches and ChangeLog Date: Sat, 21 Dec 2013 10:35:51 +0200 Message-ID: <83lhzea9eg.fsf@gnu.org> References: <8761qjfdqt.fsf@thinkpad.tsdh.org> <87wqiyu06f.fsf@thinkpad.tsdh.org> <87sitmtzg6.fsf@thinkpad.tsdh.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1387615485 13364 80.91.229.3 (21 Dec 2013 08:44:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 21 Dec 2013 08:44:45 +0000 (UTC) Cc: xfq.free@gmail.com, emacs-devel@gnu.org To: Tassilo Horn Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 21 09:44:51 2013 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 1VuIB0-0005pG-PW for ged-emacs-devel@m.gmane.org; Sat, 21 Dec 2013 09:44:50 +0100 Original-Received: from localhost ([::1]:53461 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuIB0-0000Z0-DE for ged-emacs-devel@m.gmane.org; Sat, 21 Dec 2013 03:44:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuIAs-0000Yv-UD for emacs-devel@gnu.org; Sat, 21 Dec 2013 03:44:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VuIAk-0002iv-FQ for emacs-devel@gnu.org; Sat, 21 Dec 2013 03:44:42 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:62537) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuIAk-0002im-6o; Sat, 21 Dec 2013 03:44:34 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0MY500B00EDORF00@a-mtaout23.012.net.il>; Sat, 21 Dec 2013 10:36:04 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MY500B3TEK4PR40@a-mtaout23.012.net.il>; Sat, 21 Dec 2013 10:36:04 +0200 (IST) In-reply-to: <87sitmtzg6.fsf@thinkpad.tsdh.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:166692 Archived-At: > From: Tassilo Horn > Date: Sat, 21 Dec 2013 08:50:33 +0100 > Cc: emacs-devel@gnu.org > > Hm, do you use that plugin? I do, all the time. > It doesn't seem to work as advertised here. I have put > > [/home/horn/Repos/el/emacs/] > changelog_merge_files = ChangeLog > > in my ~/.bazaar/locations.conf and updated my trunk and merged into my > taskbranch, but now the ChangeLog entries I have received from the trunk > are on top of my own entry whereas it should be the other way round. That's what this plugin is supposed to do, since your entries "arrived" in that branch before the merged ones. There's no better strategy in the general case, when there are changes in ChangeLog not only at the top. And when you merge to your bound branch, the result will be exactly right: your entries will be at the top. As I mentioned in my other mail, you need to move your entries to the top of the file before committing upstreams.