From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Teemu Likonen Newsgroups: gmane.emacs.devel Subject: DVCS workflow and bisect Date: Thu, 21 Jan 2010 18:33:46 +0200 Message-ID: <87my07beol.fsf@mithlond.arda> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264091667 13676 80.91.229.12 (21 Jan 2010 16:34:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 21 Jan 2010 16:34:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 21 17:34:19 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 1NXzz9-0001RY-3g for ged-emacs-devel@m.gmane.org; Thu, 21 Jan 2010 17:34:19 +0100 Original-Received: from localhost ([127.0.0.1]:41806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXzz9-00034M-Mw for ged-emacs-devel@m.gmane.org; Thu, 21 Jan 2010 11:34:19 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXzz3-000345-MM for emacs-devel@gnu.org; Thu, 21 Jan 2010 11:34:13 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXzyy-00032M-2o for emacs-devel@gnu.org; Thu, 21 Jan 2010 11:34:12 -0500 Original-Received: from [199.232.76.173] (port=33952 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXzyx-00032J-WE for emacs-devel@gnu.org; Thu, 21 Jan 2010 11:34:08 -0500 Original-Received: from mta-out.inet.fi ([195.156.147.13]:45232 helo=kirsi2.inet.fi) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXzyx-0005g6-AG for emacs-devel@gnu.org; Thu, 21 Jan 2010 11:34:07 -0500 Original-Received: from mithlond.arda (84.251.132.215) by kirsi2.inet.fi (8.5.014) id 4B17EFA6021DAF8C for emacs-devel@gnu.org; Thu, 21 Jan 2010 18:33:56 +0200 Original-Received: from dtw by mithlond.arda with local (Exim 4.69) (envelope-from ) id 1NXzyh-0006Ei-BP for emacs-devel@gnu.org; Thu, 21 Jan 2010 18:33:51 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) 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:120276 Archived-At: May I voice an opinion about working with DVCS? I'm an Emacs user, not developer, so feel free to ignore my comment. :-) Anyway, I just noticed a problem in the DVCS history which makes diffs more difficult to read. I'll visualize my point with "git log --graph --oneline": * d5836ff * lisp/dired-aux.el (dired-hide-all): [...] * a633481 * lisp/dired-aux.el (dired-hide-all): [...] * f8314a5 Fix ccl encoding of unibyte source. |\ | * e81c42c from trunk | |\ | |/ |/| * | fff9e27 Remove file that only works with CVS, [...] * | 62b5494 (tab-always-indent): Fix custom-type. | * 21287dd Fix ccl encoding of unibyte source. | |\ | |/ |/| * | 36d899a Redate and reposition log entry. * | 02fcc7e Fix bug#5395: typing '#' in an empty C buffer [...] (The left-most vertical line is the trunk. Asterisks [*] are commits.) We can see that commit 21287dd [1] fixes some ccl encoding issues and at the same time it merges stuff from the trunk. That results in a huge diff from which is difficult to find the actual "ccl encoding" fix. See $ bzr diff -c revid:handa@m17n.org-20100120023352-5323ovgsrok9nr72 in the Bazaar repo. The "ccl encoding" fix can be found by explicitly asking the other parent -- $ bzr diff -r revid:acm@muc.de-20100119222724-07lwniug0azx5qu8..revid:handa@m17n.org-20100120023352-5323ovgsrok9nr72 -- but that's more difficult. Also, the version control history will be difficult to bisect if that change introduced a bug. My point is not to say that the author of the commit did any serious damage or anything. I'm just suggesting that merging stuff and making other changes should be separate commits. --------------- 1. In Bazaar: revid:handa@m17n.org-20100120023352-5323ovgsrok9nr72