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: log format for vc-bzr Date: Fri, 08 Jan 2010 14:52:54 +0200 Message-ID: <831vi0bvx5.fsf@gnu.org> References: <200912081747.nB8HlwPR021836@godzilla.ics.uci.edu> <871vj3sxgy.fsf@telefonica.net> <87ws0vrd46.fsf@telefonica.net> <87hbqxa9ti.fsf@ambire.localdomain> <87k4vtd1uy.fsf@telefonica.net> <83ljg9as4g.fsf@gnu.org> <83bph4byb6.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1262955398 30920 80.91.229.12 (8 Jan 2010 12:56:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 12:56:38 +0000 (UTC) Cc: ofv@wanadoo.es, emacs-devel@gnu.org To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 13:56:31 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NTEOE-0006rn-MP for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 13:56:30 +0100 Original-Received: from localhost ([127.0.0.1]:54697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTEOF-00073g-Cu for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 07:56:31 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTEO9-00071F-VM for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:56:26 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTEO5-0006s6-IV for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:56:25 -0500 Original-Received: from [199.232.76.173] (port=33777 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTEO5-0006rv-CP for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:56:21 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:39454) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTEO4-0004Xl-HT for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:56:20 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KVX00E00IGTXK00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 08 Jan 2010 14:54:54 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVX00CXBIJDG0M0@a-mtaout20.012.net.il>; Fri, 08 Jan 2010 14:54:50 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:119681 Archived-At: > From: Juanma Barranquero > Date: Fri, 8 Jan 2010 13:24:29 +0100 > Cc: ofv@wanadoo.es, emacs-devel@gnu.org >=20 > On Fri, Jan 8, 2010 at 13:01, Eli Zaretskii wrote: >=20 > > Thanks, but isn't this in the direction that is opposite of the o= ne > > for which it was suggested? =C2=A0I though you are supposed to us= e it > > _on_the_trunk_, after merging from a branch. =C2=A0But you seem t= o show it > > in the other direction, which confuses this issue even more, at l= east > > for me. >=20 > I don't know what in my message (other than my usual clarity or lac= k > of it) makes you think that. You ran "bzr status" in the trunk, that's why. Sorry. > > So its effect is similar to that of rebasing? >=20 > Humm, no. Leaving aside uncommited changes, conflicts, etc., rebase > un-applies some commits, updates the branch, and reapplies these > commits as if they were new. "revert --pending-changes" is done on = a > branch that has just been the target of a merge, and affects change= s > that have not yet been committed. But isn't the effect on the resulting revision DAG very similar? > > But the issue at hand was how to hide personal comments in the co= mmit > > messages, not how to hide some of the intermediate changes. =C2= =A0Why would > > I want to do the latter? >=20 > Sorry, I don't follow what do you mean with "personal comments" vs. > "intermediate changes". I think =C3=93scar meant that you have a br= anch > with several commits, some of them meaningful, some of them of the > "gone to lunch" variety, some reverting previous changes, etc. Yes, I see that now, but if ttn called that ``personal junk'', then I cannot disagree more. That's the history of my work; I don't see how someone could object to having it in the public repository. Without it, some changes, such as inadvertent merge mistakes, can never be investigated and will remain a mystery forever. I do understand that "revert --forget-merges" is one way of hiding some of my changes from the public eye. But I don't see any compelling use-case for that, except some marginal situations. OTOH, my bzr experience with local branches is so short that my opinions probably don't matter much. ;-) Thanks.