From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Fri, 24 Mar 2017 18:27:42 -0500 Message-ID: <86mvcap85t.fsf@stephe-leake.org> 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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1490398121 17943 195.159.176.226 (24 Mar 2017 23:28:41 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 24 Mar 2017 23:28:41 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (windows-nt) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 25 00:28:35 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 1crYd8-0002YI-Hd for ged-emacs-devel@m.gmane.org; Sat, 25 Mar 2017 00:28:26 +0100 Original-Received: from localhost ([::1]:35283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crYd9-0005i7-FG for ged-emacs-devel@m.gmane.org; Fri, 24 Mar 2017 19:28:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crYcb-0005hq-Qb for emacs-devel@gnu.org; Fri, 24 Mar 2017 19:27:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crYcW-0002KI-Qh for emacs-devel@gnu.org; Fri, 24 Mar 2017 19:27:53 -0400 Original-Received: from smtp145.ord.emailsrvr.com ([173.203.6.145]:33088) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1crYcW-0002Iq-ME for emacs-devel@gnu.org; Fri, 24 Mar 2017 19:27:48 -0400 Original-Received: from smtp23.relay.ord1a.emailsrvr.com (localhost [127.0.0.1]) by smtp23.relay.ord1a.emailsrvr.com (SMTP Server) with ESMTP id EECA6400B8 for ; Fri, 24 Mar 2017 19:27:46 -0400 (EDT) X-Auth-ID: board-president@tomahawk-creek-hoa.com Original-Received: by smtp23.relay.ord1a.emailsrvr.com (Authenticated sender: board-president-AT-tomahawk-creek-hoa.com) with ESMTPSA id B4DA54017B for ; Fri, 24 Mar 2017 19:27:46 -0400 (EDT) X-Sender-Id: board-president@tomahawk-creek-hoa.com Original-Received: from Takver4 (76-218-37-33.lightspeed.kscymo.sbcglobal.net [76.218.37.33]) (using TLSv1.2 with cipher AES128-GCM-SHA256) by 0.0.0.0:587 (trex/5.7.12); Fri, 24 Mar 2017 19:27:46 -0400 In-Reply-To: <58D4E0D6.2070101@gmx.at> (martin rudalics's message of "Fri, 24 Mar 2017 10:03:18 +0100") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 173.203.6.145 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:213320 Archived-At: martin rudalics writes: >>> It's distracting for people like me who don't understand git. Today it >>> confused me enough that I messed up the ChangeLog of my commit and did >>> not notice it before pushing. >> >> Hmmm... I can't see how that could happen if you don't actually use that >> branch, so I guess you've merged from that branch and tried to re-merge? > > No. I started to read about forced updates and didn't check the > status of my commit thoroughly. > >> It's not essential, but some people like to keep branches as a clean set >> of patches on top of master, so they regularly rebase (and reorganize >> the set of patches), so in the end it doesn't give you the path that was >> followed to get there (which, while historically accurate, tends to be >> messy and hard to follow) but only "a nice path to get there", which is >> basically a single patch divided into a few commented logical steps. > > Isn't one of the primary purposes of a branch (besides of sharing) to > record the historically accurate picture of how its authors arrived at > the present state? If not I really am an idiot wrt version controlling. It depends. The "monotone" version control system absolutely forbids tampering with past history; the history increments "monotonically". But git is more flexible; it allows editing history. One reason to edit history is because you used the tool wrong (happens a lot :). 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. -- -- Stephe