From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: log format for vc-bzr Date: Wed, 09 Dec 2009 23:34:01 +0100 Message-ID: <87ws0vrd46.fsf@telefonica.net> 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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1260398119 804 80.91.229.12 (9 Dec 2009 22:35:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Dec 2009 22:35:19 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 09 23:35:12 2009 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 1NIV7o-0006sz-D4 for ged-emacs-devel@m.gmane.org; Wed, 09 Dec 2009 23:35:12 +0100 Original-Received: from localhost ([127.0.0.1]:49450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NIV7n-0007MR-QN for ged-emacs-devel@m.gmane.org; Wed, 09 Dec 2009 17:35:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NIV7B-0006me-Eh for emacs-devel@gnu.org; Wed, 09 Dec 2009 17:34:33 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NIV75-0006h9-W4 for emacs-devel@gnu.org; Wed, 09 Dec 2009 17:34:32 -0500 Original-Received: from [199.232.76.173] (port=59311 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NIV75-0006gq-On for emacs-devel@gnu.org; Wed, 09 Dec 2009 17:34:27 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:39264) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NIV74-0007K0-Vz for emacs-devel@gnu.org; Wed, 09 Dec 2009 17:34:27 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NIV71-0006au-7r for emacs-devel@gnu.org; Wed, 09 Dec 2009 23:34:23 +0100 Original-Received: from 64.red-83-34-21.dynamicip.rima-tde.net ([83.34.21.64]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 09 Dec 2009 23:34:23 +0100 Original-Received: from ofv by 64.red-83-34-21.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 09 Dec 2009 23:34:23 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 30 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 64.red-83-34-21.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) Cancel-Lock: sha1:Gp8Z5bo1Ub1/NeyTWNDNmXcGQGU= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:118494 Archived-At: Andreas Schwab writes: >>> There is nothing wrong with that, but do that only in your private local >>> branch and don't publish those junk commits. They carry no value. >> >> What about the example I posted before? With the recommended distributed >> workflow, you are going to *double* the history length with redundant >> entries: >> >> 1343 Fixed bug #2423 (merge) >> 1343.1 Fixed bug #2423 (original commit) >> >> Isn't that junk? > > Yes, there is no value in a merge like this, it can just as well put > directly on the branch. Well, we will see *lots* of history entries like that. It is a byproduct of the distributed workflow. An insignificant one, because you are not supposed to look into the merge histories of microbranches. That's why bzr defaults to not showing merged histories. The Emacs project is about producing a great piece of software, not about producing a very nice VC log. If we have to introduce quite a bit of junk into the *hidden* VC history of the project on exchange for a better experience while developing the code, it is a good deal, IMO. -- Óscar