From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Fri, 24 Mar 2017 19:40:22 -0400 Message-ID: References: <58CB9F6B.5080806@gmx.at> <83h92sz2j9.fsf@gnu.org> <58CBAEB7.5030601@gmx.at> <58CBBC6C.8000104@gmx.at> <58D380FF.1070103@gmx.at> <58D3C84E.5080808@gmx.at> <58D4E0D6.2070101@gmx.at> <86mvcap85t.fsf@stephe-leake.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1490398853 5656 195.159.176.226 (24 Mar 2017 23:40:53 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 24 Mar 2017 23:40:53 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 25 00:40:49 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crYp1-0000Gv-7a for ged-emacs-devel@m.gmane.org; Sat, 25 Mar 2017 00:40:43 +0100 Original-Received: from localhost ([::1]:35314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crYp4-0000dK-3R for ged-emacs-devel@m.gmane.org; Fri, 24 Mar 2017 19:40:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crYoy-0000dE-7Y for emacs-devel@gnu.org; Fri, 24 Mar 2017 19:40:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crYou-0006f4-8h for emacs-devel@gnu.org; Fri, 24 Mar 2017 19:40:40 -0400 Original-Received: from [195.159.176.226] (port=47931 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1crYou-0006ex-2e for emacs-devel@gnu.org; Fri, 24 Mar 2017 19:40:36 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1crYoj-00075J-Km for emacs-devel@gnu.org; Sat, 25 Mar 2017 00:40:25 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 18 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:0wP0AHU1TyebYD5g+s5q3ki3g1k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:213322 Archived-At: > Another reason is the scenario Stefan mentioned; you are messing around > in a branch, finally get it right, and rewrite history to pretend you > knew where you would end up all along. > It might make sense to keep the messy branch for history, and create a > new branch that has the clean sequence of commits. But we officially > only care about history on the main branch. FWIW, I consider Git's solution to be unsatisfactory. IMO, when we do a "rebase", Git should also keep the previous history, tho only as a kind of "weak reference", so you wouldn't see that "truthful&messy" history unless you cared about it: the rebased revision wouldn't be enough to recover that messy history, but it would be enough to relate the new revision with some past "messy" revision you happened to have lying about. Stefan