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: Sun, 05 Apr 2015 22:05:06 +0300 Message-ID: <83twwul7kt.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> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <551FA115.5090400@gmx.at> <834mowp7cj.fsf@gnu.org> <55200A71.9040902@gmx.at> <83oan3onki.fsf@gnu.org> <87sicffqma.fsf@uwakimon.sk.tsukuba.ac.jp> <834movnjm0.fsf@gnu.org> <87lhi7ezge.fsf@uwakimon.sk.tsukuba.ac.jp> <83y4m6n4j0.fsf@gnu.org> <87fv8efm7n.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428260751 4283 80.91.229.3 (5 Apr 2015 19:05:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 19:05:51 +0000 (UTC) Cc: rudalics@gmx.at, sorganov@gmail.com, rms@gnu.org, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 21:05:43 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 1Yepra-0008JF-J1 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 21:05:42 +0200 Original-Received: from localhost ([::1]:37356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeprZ-0006X6-I3 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 15:05:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeprO-0006WZ-I5 for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:05:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeprI-00037p-HN for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:05:30 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:62220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeprI-00037e-3R; Sun, 05 Apr 2015 15:05:24 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NMC00C00KYL9B00@a-mtaout20.012.net.il>; Sun, 05 Apr 2015 22:05:03 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC00BGNL0FY2A0@a-mtaout20.012.net.il>; Sun, 05 Apr 2015 22:05:03 +0300 (IDT) In-reply-to: <87fv8efm7n.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:184968 Archived-At: > From: "Stephen J. Turnbull" > Cc: rudalics@gmx.at, > sorganov@gmail.com, > rms@gnu.org, > emacs-devel@gnu.org > Date: Mon, 06 Apr 2015 03:45:32 +0900 > > Unfortunately, there's the case that hasn't been mentioned explicitly, > which is where he has a code change that touches multiple files, some > of which are conflicted and some of which are not. The conflicted > files have to be committed to keep git happy unless you do some > "advanced" stuff, such as stash. I don't think you really want > Richard's changes mixed with merge changes. Yes, in that case all the uncommitted changes belonging to the same changeset as the conflicted changes will have to be committed as well.