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: Fri, 03 Apr 2015 14:41:22 +0300 Message-ID: <83lhi9phgd.fsf@gnu.org> References: <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> <86384lciin.fsf@dod.no> <83bnj7syd5.fsf@gnu.org> <87y4mbhnw1.fsf@gmail.com> <83wq1vrgbk.fsf@gnu.org> <87sicjggj6.fsf@gmail.com> <83ego2r2vc.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428061309 8548 80.91.229.3 (3 Apr 2015 11:41:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 11:41:49 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 13:41:39 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 1Ydzyj-0005bn-T8 for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 13:41:38 +0200 Original-Received: from localhost ([::1]:33692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydzyj-0003tA-CM for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 07:41:37 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydzyf-0003t3-1x for emacs-devel@gnu.org; Fri, 03 Apr 2015 07:41:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydzya-0000bZ-1a for emacs-devel@gnu.org; Fri, 03 Apr 2015 07:41:32 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:60706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdzyZ-0000b2-QG; Fri, 03 Apr 2015 07:41:27 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NM800L00B6O1U00@mtaout26.012.net.il>; Fri, 03 Apr 2015 14:42:35 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM800HJVB6Z5G30@mtaout26.012.net.il>; Fri, 03 Apr 2015 14:42:35 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 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:184831 Archived-At: > Date: Fri, 03 Apr 2015 07:02:39 -0400 > From: Richard Stallman > CC: emacs-devel@gnu.org > > I always commit an entire changeset -- that's why I use vc-dir -- but > the changeset is often not all of the files I have edited. Over a few > weeks I may have fixed a few bugs in different files. I commit the > different fixes separately. Do you also push each such commit immediately, or do you wait for all of the fixes to be ready and committed, and then push them all in one go? If the former, then having uncommitted changes should not be a problem, except if "git pull" complains about conflicts. I'd suggest to hold off your ChangeLog entries until just before you commit the changeset, because most conflicts are caused by ChangeLog's. (This issue will disappear in a few days, when we stop maintaining ChangeLog files in the repository.)