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: Wed, 01 Apr 2015 17:20:59 +0300 Message-ID: <83mw2srktw.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> <86ego5cp95.fsf@dod.no> <20150331154839.GE2871@acm.fritz.box> <87pp7phxt1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331204609.GG2871@acm.fritz.box> <87k2xwj11j.fsf@uwakimon.sk.tsukuba.ac.jp> <551B8DD0.1010800@math.ntnu.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427898127 1736 80.91.229.3 (1 Apr 2015 14:22:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 14:22:07 +0000 (UTC) Cc: acm@muc.de, stephen@xemacs.org, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 16:22:00 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 1YdJWq-0006yv-D6 for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 16:22:00 +0200 Original-Received: from localhost ([::1]:52935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJWp-0000CY-PH for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 10:21:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJWl-0000CN-Ie for emacs-devel@gnu.org; Wed, 01 Apr 2015 10:21:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdJWg-00078Z-NA for emacs-devel@gnu.org; Wed, 01 Apr 2015 10:21:55 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:37439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJWe-000789-FE for emacs-devel@gnu.org; Wed, 01 Apr 2015 10:21:50 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NM400600SW9IT00@mtaout27.012.net.il> for emacs-devel@gnu.org; Wed, 01 Apr 2015 17:15:58 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM400PO4SYM3960@mtaout27.012.net.il>; Wed, 01 Apr 2015 17:15:58 +0300 (IDT) In-reply-to: <551B8DD0.1010800@math.ntnu.no> 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.183 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:184714 Archived-At: > Date: Wed, 01 Apr 2015 08:18:56 +0200 > From: Harald Hanche-Olsen > Cc: Alan Mackenzie , emacs-devel@gnu.org > > Richard's repo is tangled *because* he, like you, doesn't commit until > he's ready to push. > > That's overstating it; it is clear from his reflog (posted to the list) that he committed three times before the disaster. He did neglect to commit *once* before pulling, that is true. I used to think that is what caused his problems too, but Eli says he *should* pull before committing, so that can't be the reason. No, this is a misunderstanding. I didn't say that pulling before committing will never cause any problems, I just said that problems it could cause, such as this one, will be easier for Richard to understand, because they are very similar to what happens with CVS in the same situation. In any case, whether he pulls before checkin, or tries to checkin and if that fails, commits locally, then pulls, then retries the checkin, Richard will have to learn how to deal with the failure. I just think it will be easier for him to adapt to the former than to the latter. But it's for Richard to decide, obviously. In addition, Richard should install the git-merge-changelog driver (or wait until we stop using ChangeLog files), because then the merge conflicts during pull with uncommitted changes will be much more rare.