From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.devel Subject: Re: Bzr taskbranches and ChangeLog Date: Mon, 23 Dec 2013 09:15:09 +0100 Message-ID: <87sitkt242.fsf@tsdh.uni-koblenz.de> References: <8761qjfdqt.fsf@thinkpad.tsdh.org> <87wqiyu06f.fsf@thinkpad.tsdh.org> <87sitmtzg6.fsf@thinkpad.tsdh.org> <83lhzea9eg.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1387786527 19225 80.91.229.3 (23 Dec 2013 08:15:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Dec 2013 08:15:27 +0000 (UTC) Cc: xfq.free@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 23 09:15:33 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 1Vv0fk-0006RT-Na for ged-emacs-devel@m.gmane.org; Mon, 23 Dec 2013 09:15:32 +0100 Original-Received: from localhost ([::1]:60742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv0fk-0005cm-6k for ged-emacs-devel@m.gmane.org; Mon, 23 Dec 2013 03:15:32 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv0fb-0005bg-9U for emacs-devel@gnu.org; Mon, 23 Dec 2013 03:15:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vv0fV-00038x-Co for emacs-devel@gnu.org; Mon, 23 Dec 2013 03:15:23 -0500 Original-Received: from deliver.uni-koblenz.de ([141.26.64.15]:41466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv0fP-00037x-3i; Mon, 23 Dec 2013 03:15:11 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by deliver.uni-koblenz.de (Postfix) with ESMTP id B65711A8534; Mon, 23 Dec 2013 09:15:10 +0100 (CET) X-Virus-Scanned: amavisd-new at uni-koblenz.de Original-Received: from deliver.uni-koblenz.de ([127.0.0.1]) by localhost (deliver.uni-koblenz.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U8mB0HVhozWm; Mon, 23 Dec 2013 09:15:10 +0100 (CET) X-CHKRCPT: Envelopesender noch tsdh@gnu.org Original-Received: from tsdh.uni-koblenz.de (tsdh.uni-koblenz.de [141.26.67.142]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by deliver.uni-koblenz.de (Postfix) with ESMTPSA id 55AB21A842A; Mon, 23 Dec 2013 09:15:10 +0100 (CET) Mail-Followup-To: Eli Zaretskii , xfq.free@gmail.com, emacs-devel@gnu.org In-Reply-To: <83lhzea9eg.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 Dec 2013 10:35:51 +0200") User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 141.26.64.15 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:166763 Archived-At: Eli Zaretskii writes: >> 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. Yes, now I got it. > 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. I'll do so, and in the future I'm going to use the "write ChangeLog only before publishing upstream" tactics. >> Now the result is that "bzr missing" tells me that I have 2 extra >> revisions and no missing ones. However, "bzr log" doesn't show me >> the commits I've just merged, but the changes are here. The commits >> seem to be amalgamated in the merge commit that's on top of the log >> right now. Is that how it is supposed to be? > > Yes. By default, "bzr log" hides all the individual commits on > another branch that you merged, and shows only a single merge commit. > To see the revisions from another branch, do "bzr log -n0" or "bzr log > --include-merged". Ah, thanks. Bye, Tassilo