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: Sat, 21 Dec 2013 09:03:54 +0100 Message-ID: <87lhzetytx.fsf@thinkpad.tsdh.org> References: <8761qjfdqt.fsf@thinkpad.tsdh.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1387613048 24541 80.91.229.3 (21 Dec 2013 08:04:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 21 Dec 2013 08:04:08 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 21 09:04:14 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 1VuHXh-00047p-Vf for ged-emacs-devel@m.gmane.org; Sat, 21 Dec 2013 09:04:14 +0100 Original-Received: from localhost ([::1]:53321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuHXh-0006pn-CV for ged-emacs-devel@m.gmane.org; Sat, 21 Dec 2013 03:04:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuHXZ-0006fD-BP for emacs-devel@gnu.org; Sat, 21 Dec 2013 03:04:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VuHXS-0000IB-EM for emacs-devel@gnu.org; Sat, 21 Dec 2013 03:04:05 -0500 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:51815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuHXS-0000Hy-An for emacs-devel@gnu.org; Sat, 21 Dec 2013 03:03:58 -0500 Original-Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id A725820AB4 for ; Sat, 21 Dec 2013 03:03:55 -0500 (EST) Original-Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Sat, 21 Dec 2013 03:03:55 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:references:date :in-reply-to:message-id:mime-version:content-type; s=smtpout; bh=FH6duHf8qH5a6SLbUVVMo/Yz7us=; b=BrdmFolOTU9Zlx2Nw4UsY5YfNeT3 MelHRmqJ8OMycItd6qu5A6Udt77EUNc88LkahMZPLLMtIr8+RuZX8pLnhBmJtULG E101h6zCdoBU5oH219eNgwji/KiVPmiTj95HJgvIbC+blsvswfOX0cvp4GZhS8Ym 1G7ToBUK6uifJXI= X-Sasl-enc: keGLpp4Yz9EH+FK7vqHBGxUj9UPgV1ZM1FDIt5X7qzHK 1387613035 Original-Received: from thinkpad.tsdh.org (unknown [91.67.164.26]) by mail.messagingengine.com (Postfix) with ESMTPA id 38FD4680145 for ; Sat, 21 Dec 2013 03:03:55 -0500 (EST) Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: <8761qjfdqt.fsf@thinkpad.tsdh.org> (Tassilo Horn's message of "Fri, 20 Dec 2013 21:50:50 +0100") User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.111.4.27 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:166687 Archived-At: Hi again, now I assumed that the changelog_merge plugin would DTRT (which it didn't) I committed my changes including those in the ChangeLog. Then, as documented on emacswiki, I did $ cd ../trunk $ bzr update $ cd ../bug-16090 $ bzr merge $ bzr status $ bzr commit -m "Merge from trunk." 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? Bye, Tassilo