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: VC mode and git Date: Thu, 02 Apr 2015 20:30:06 +0300 Message-ID: <831tk2qvz5.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427996200 8639 80.91.229.3 (2 Apr 2015 17:36:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 17:36:40 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 19:36:33 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 1Ydj2e-0002f7-GY for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 19:36:32 +0200 Original-Received: from localhost ([::1]:59600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydj2d-00045C-S1 for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 13:36:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydiwc-000234-5X for emacs-devel@gnu.org; Thu, 02 Apr 2015 13:30:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdiwX-0008Au-Vl for emacs-devel@gnu.org; Thu, 02 Apr 2015 13:30:18 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:33475) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdiwX-0008AY-Ov for emacs-devel@gnu.org; Thu, 02 Apr 2015 13:30:13 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NM600C00WM3DC00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 02 Apr 2015 20:30:12 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM600CYQWMB7X30@a-mtaout22.012.net.il>; Thu, 02 Apr 2015 20:30:12 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:184796 Archived-At: > From: Sergey Organov > Date: Thu, 02 Apr 2015 20:02:02 +0300 > > >> > A merge does much more than just commit. At least AFAIU. > >> > >> Dunno what you have in mind. > > > > The changes to meta-data that reflect the changes in the history DAG. > > No meta-data outside of the commit, AFAIK. > > Each commit has zero or more pointers to parents, usually 1. Merge > commit is commit that has more pointers to parents than 1 (usually 2). > That's all about the meta-data. Simple, eh? And that meta-data needs to be brought in as part of the merge, in addition to changes to the tree. You can call all of this a "commit", but then you probably mean "commit object", a different beast. Using confusing shorts in this discussion doesn't help understanding.