From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Thu, 02 Apr 2015 20:28:10 +0200 Message-ID: <87bnj6v0zp.fsf@igel.home> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427999337 27870 80.91.229.3 (2 Apr 2015 18:28:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 18:28:57 +0000 (UTC) Cc: Sergey Organov , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 20:28:40 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 1Ydjr2-0006Pk-Bd for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 20:28:36 +0200 Original-Received: from localhost ([::1]:59804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydjr1-0000yB-O9 for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 14:28:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydjql-0000xp-81 for emacs-devel@gnu.org; Thu, 02 Apr 2015 14:28:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydjqk-0007lh-89 for emacs-devel@gnu.org; Thu, 02 Apr 2015 14:28:19 -0400 Original-Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:45482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydjqg-0007jP-TS; Thu, 02 Apr 2015 14:28:15 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3lHtDr05hVz3hhfv; Thu, 2 Apr 2015 20:28:12 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3lHtDq6nXqzvh20; Thu, 2 Apr 2015 20:28:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id h1ag0yaYkXGC; Thu, 2 Apr 2015 20:28:10 +0200 (CEST) X-Auth-Info: E/UFt3xjbwlfZmyphzWoNhhPuVRqoTavp2EGSX79Jd5WwdD9K+vjDiqMkD2xSLuG Original-Received: from igel.home (ppp-88-217-106-11.dynamic.mnet-online.de [88.217.106.11]) by mail.mnet-online.de (Postfix) with ESMTPA; Thu, 2 Apr 2015 20:28:10 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id 594FA2C3E45; Thu, 2 Apr 2015 20:28:10 +0200 (CEST) X-Yow: Wow! Look!! A stray meatball!! Let's interview it! In-Reply-To: <831tk2qvz5.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 02 Apr 2015 20:30:06 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:a60:0:28:0:1:25:1 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:184800 Archived-At: Eli Zaretskii writes: > And that meta-data needs to be brought in as part of the merge, in > addition to changes to the tree. Just like a commit with a single parent, or any commit. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."