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:43:24 +0200 Message-ID: <83k3eya91v.fsf@gnu.org> References: <8761qjfdqt.fsf@thinkpad.tsdh.org> <87lhzetytx.fsf@thinkpad.tsdh.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1387615496 13571 80.91.229.3 (21 Dec 2013 08:44:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 21 Dec 2013 08:44:56 +0000 (UTC) Cc: 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:45:01 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 1VuIBA-0005vv-K9 for ged-emacs-devel@m.gmane.org; Sat, 21 Dec 2013 09:45:00 +0100 Original-Received: from localhost ([::1]:53462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuIBA-0000lx-6S for ged-emacs-devel@m.gmane.org; Sat, 21 Dec 2013 03:45:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuIB1-0000bP-4u for emacs-devel@gnu.org; Sat, 21 Dec 2013 03:44:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VuIAv-0002jr-8r for emacs-devel@gnu.org; Sat, 21 Dec 2013 03:44:51 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:35971) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VuIAv-0002jf-0x; Sat, 21 Dec 2013 03:44:45 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0MY500500ELEFZ00@a-mtaout20.012.net.il>; Sat, 21 Dec 2013 10:43:37 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MY5005C8EWPF940@a-mtaout20.012.net.il>; Sat, 21 Dec 2013 10:43:37 +0200 (IST) In-reply-to: <87lhzetytx.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.166 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:166693 Archived-At: > From: Tassilo Horn > Date: Sat, 21 Dec 2013 09:03:54 +0100 > > 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? 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". (These are slow, so you may wish to install the history_db plugin, which makes them as fast as the default "bzr log".) You will see the same in the trunk branch regarding your changes in the feature branch that you merged: they appear as a single merge commit. See "bzr help log" for more fun.