From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: Branches are Scary Date: Fri, 18 Dec 2015 10:43:37 +0000 Message-ID: <87io3w595y.fsf@russet.org.uk> References: <87bn9oydgw.fsf@russet.org.uk> <874mfgn3t7.fsf@acer.localhost.com> <8737v0yay1.fsf@russet.org.uk> <83fuz0xlk9.fsf@gnu.org> <838u4sxh2e.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1450435432 28051 80.91.229.3 (18 Dec 2015 10:43:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Dec 2015 10:43:52 +0000 (UTC) Cc: i.lohmar@gmail.com, emacs-devel@gnu.org, Yuri Khan To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 18 11:43:47 2015 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 1a9sVn-0005Iq-2P for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 11:43:47 +0100 Original-Received: from localhost ([::1]:59501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9sVm-00066z-FN for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 05:43:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9sVj-00066j-46 for emacs-devel@gnu.org; Fri, 18 Dec 2015 05:43:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9sVi-0007bq-48 for emacs-devel@gnu.org; Fri, 18 Dec 2015 05:43:43 -0500 Original-Received: from cheviot12.ncl.ac.uk ([128.240.234.12]:36067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9sVe-0007bH-At; Fri, 18 Dec 2015 05:43:38 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot12.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1a9sVd-0006IC-BH; Fri, 18 Dec 2015 10:43:37 +0000 Original-Received: from jangai.ncl.ac.uk ([10.66.67.223] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1a9sVd-0005E7-C7; Fri, 18 Dec 2015 10:43:37 +0000 In-Reply-To: <838u4sxh2e.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 18 Dec 2015 11:05:29 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 128.240.234.12 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:196463 Archived-At: Eli Zaretskii writes: >> From: Yuri Khan >> Date: Fri, 18 Dec 2015 13:49:39 +0600 >> Cc: Phillip Lord , i.lohmar@gmail.com,=20 >> Emacs developers >>=20 >> On Fri, Dec 18, 2015 at 1:28 PM, Eli Zaretskii wrote: >>=20 >> >> > If you still plan substantial cleanup of your commits, just >> >> > do not push them yet. >> >> >> >> Makes it hard to get comments on them, I think. >> > >> > How's that? Can you tell more details how getting comments requires >> > squashing? >>=20 >> Getting comments doesn=E2=80=99t. Acting on comments sort of does. >>=20 >> Sure, you can push a follow-up commit with a =E2=80=9CPost-review fix=E2= =80=9D >> subject, but it makes history too detailed. Or you can squash fixes >> into the commits that introduced the respective issues. > > I see, thanks for explaining. Exactly. My patch to undo.c was a single commit, but was squashed from about 20, some of which introduced C primitive functions which were later removed again, and many of which were small changes. > So I think the too detailed history is not important for these > branches, since they eventually are going to be deleted. Therefore, > my advice is just not to squash there. Is what I did. But that doesn't allow you to get feedback on the final completed feature. > Alternatively, one could push a new branch after each round of comment > adjudication, and have that new branch have all the changes squashed > into a single commit. The previous branch would then be deleted. Yes, that also works but is long-winded. Alternatively, have feature and fix branches squashable, while emacs-* and master-* are not so. Phil