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 11:00:15 +0200 Message-ID: <83ljg9as4g.fsf@gnu.org> References: <200912081747.nB8HlwPR021836@godzilla.ics.uci.edu> <874oo1w9y1.fsf@telefonica.net> <87tyw1uss6.fsf@telefonica.net> <200912082203.nB8M3FLP023771@godzilla.ics.uci.edu> <87hbs1at4u.fsf@notengoamigos.org> <871vj3sxgy.fsf@telefonica.net> <87ws0vrd46.fsf@telefonica.net> <87hbqxa9ti.fsf@ambire.localdomain> <87k4vtd1uy.fsf@telefonica.net> 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 1262941545 19592 80.91.229.12 (8 Jan 2010 09:05:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 09:05:45 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 10:05:38 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 1NTAmn-0001uh-QR for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 10:05:38 +0100 Original-Received: from localhost ([127.0.0.1]:60517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTAmo-0006be-9c for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 04:05:38 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTAkJ-0003yl-KT for emacs-devel@gnu.org; Fri, 08 Jan 2010 04:03:03 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTAkE-0003uK-EW for emacs-devel@gnu.org; Fri, 08 Jan 2010 04:03:03 -0500 Original-Received: from [199.232.76.173] (port=59150 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTAkE-0003u3-9T for emacs-devel@gnu.org; Fri, 08 Jan 2010 04:02:58 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:60333) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTAkD-0006Uu-Mk for emacs-devel@gnu.org; Fri, 08 Jan 2010 04:02:57 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KVX006007QIRJ00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:02:11 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVX005IY7RMSZ70@a-mtaout20.012.net.il>; Fri, 08 Jan 2010 11:02:11 +0200 (IST) In-reply-to: <87k4vtd1uy.fsf@telefonica.net> 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:119658 Archived-At: > From: =C3=93scar_Fuentes > Date: Thu, 07 Jan 2010 22:47:01 +0100 >=20 > Thien-Thi Nguyen writes: >=20 > > Well, we will see *lots* of history entries like that. > > > > It is a byproduct of the distributed workflow. An insignifican= t one, > > because you are not supposed to look into the merge histories = of > > microbranches. That's why bzr defaults to not showing merged h= istories. > > > > I would rather not discourage curiosity, but instead, bad manners= . > > Unrestrained publishing of personal junk is bad manners. >=20 > bzr revert --forget-merges >=20 > allows to commit into microbranches as one pleases and leave a nice > corpse afterwards. As usual, the Bazaar documentation doesn't say anything about this option that can be grokked by Bazaar non-experts. --forget-merges=20 Remove pending merge marker, without changing any files. What is a ``pending merge marker''? And how removing it resolves the problem at hand? And if this is the magic wand to leave personal commit comments out of the public repository, then shouldn't we add this to the recommended workflow on the wiki?