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 16:46:56 +0000 Message-ID: <87a8p73drz.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> <87d1u3pxjz.fsf@fastmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1450457642 12253 80.91.229.3 (18 Dec 2015 16:54:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Dec 2015 16:54:02 +0000 (UTC) Cc: emacs-devel@gnu.org To: Random832 Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 18 17:53:56 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 1a9yHz-00084L-2n for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 17:53:55 +0100 Original-Received: from localhost ([::1]:33694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9yHy-0004s9-BD for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 11:53:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9yBL-0000sq-3M for emacs-devel@gnu.org; Fri, 18 Dec 2015 11:47:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9yBF-0005XM-Sp for emacs-devel@gnu.org; Fri, 18 Dec 2015 11:47:01 -0500 Original-Received: from cheviot22.ncl.ac.uk ([128.240.234.22]:33918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9yBF-0005Wy-MW for emacs-devel@gnu.org; Fri, 18 Dec 2015 11:46:57 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot22.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1a9yBE-0001sE-Fg; Fri, 18 Dec 2015 16:46:56 +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 1a9yBE-0006fX-C5; Fri, 18 Dec 2015 16:46:56 +0000 In-Reply-To: <87d1u3pxjz.fsf@fastmail.com> (Random's message of "Fri, 18 Dec 2015 10:48:48 -0500") 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.22 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:196478 Archived-At: Random832 writes: > Eli Zaretskii writes: >> 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. > > If they get merged, the branch may be deleted but the history > stays forever, as part of the history graph of the branch it is > merged into. I suppose you could squash (and rebase, so the > parent branch can be fast-forwarded) before merging, so that the > merge reflects the squashed history rather than the real history > that existed on the branch (and then never push the squashed > version to the feature branch). Is that what you meant? > > Seems... fiddly, to me. It's a fairly normal way of operating. Currently, the squashed version has to be off the main git, though, because you can't force push. So the last commit before the merge can't be reviewed by some else, at least not on the branch that it started off from. Phil