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: Branches are Scary Date: Fri, 18 Dec 2015 11:05:29 +0200 Message-ID: <838u4sxh2e.fsf@gnu.org> References: <87bn9oydgw.fsf@russet.org.uk> <874mfgn3t7.fsf@acer.localhost.com> <8737v0yay1.fsf@russet.org.uk> <83fuz0xlk9.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1450429536 30037 80.91.229.3 (18 Dec 2015 09:05:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Dec 2015 09:05:36 +0000 (UTC) Cc: i.lohmar@gmail.com, emacs-devel@gnu.org, phillip.lord@russet.org.uk To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 18 10:05:35 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 1a9qyg-0000WP-NS for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 10:05:30 +0100 Original-Received: from localhost ([::1]:59057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9qyg-00018a-0P for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 04:05:30 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9qyN-00018P-Oo for emacs-devel@gnu.org; Fri, 18 Dec 2015 04:05:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9qyJ-0008Hp-MA for emacs-devel@gnu.org; Fri, 18 Dec 2015 04:05:11 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52475) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9qyJ-0008Hk-Iq; Fri, 18 Dec 2015 04:05:07 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1720 helo=HOME-C4E4A596F7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1a9qyI-0008SP-RN; Fri, 18 Dec 2015 04:05:07 -0500 In-reply-to: (message from Yuri Khan on Fri, 18 Dec 2015 13:49:39 +0600) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:196455 Archived-At: > From: Yuri Khan > Date: Fri, 18 Dec 2015 13:49:39 +0600 > Cc: Phillip Lord , i.lohmar@gmail.com, > Emacs developers > > On Fri, Dec 18, 2015 at 1:28 PM, Eli Zaretskii wrote: > > >> > 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? > > Getting comments doesn’t. Acting on comments sort of does. > > Sure, you can push a follow-up commit with a “Post-review fix” > 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. 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. 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.