From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Fri, 03 Apr 2015 17:43:36 +0300 Message-ID: References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <83vbhdpsue.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1428072240 22858 80.91.229.3 (3 Apr 2015 14:44:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 14:44:00 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 16:43:51 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 1Ye2p4-0008Ms-S2 for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 16:43:51 +0200 Original-Received: from localhost ([::1]:34379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye2p4-0003vF-9v for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 10:43:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye2p0-0003v3-9i for emacs-devel@gnu.org; Fri, 03 Apr 2015 10:43:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ye2ox-0004a4-4X for emacs-devel@gnu.org; Fri, 03 Apr 2015 10:43:46 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:49044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye2ow-0004a0-U6 for emacs-devel@gnu.org; Fri, 03 Apr 2015 10:43:43 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ye2ow-0008IF-21 for emacs-devel@gnu.org; Fri, 03 Apr 2015 16:43:42 +0200 Original-Received: from 89.175.180.246 ([89.175.180.246]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 03 Apr 2015 16:43:42 +0200 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 03 Apr 2015 16:43:42 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 37 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 89.175.180.246 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184838 Archived-At: Eli, here is how our conversation went so far (emphasizes are mine): You [trying to show how bad Git documentation is]: So what does it mean to "incorporate changes in the current branch", if the branch is just a pointer? Me: Incorporating changes means the same thing every time: commit. What's new or unusual about it? You: A merge does much more than just commit. At least AFAIU. Me: Dunno what you have in mind. After true merge operation is finished, the only result of it is single commit appended to your current branch. Git /is/ that simple. *All the possible complexity is in the stage of content preparation for this commit.* You: [as the answer to "Dunno what you have in mind"]: The changes to meta-data that reflect the changes in the history DAG. Me: No meta-data outside of the commit, AFAIK. [then explaining the only 2 references of meta-data stored in commit] You: That meta-data needs to be brought in as part of the merge, *in addition to changes to the tree*. Me: What did you mean? What changes to what meta-data? Reflecting what changes in the history DAG? And now I got your recent answer that doesn't even mention either "DAG" or "meta-data", but rather suddenly unveils the fact that 'git merge' computes *changes to the tree* before committing the result. I'm sorry, but I have to give-up at this point. -- Sergey.