From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 01 Apr 2015 16:14:06 +0900 Message-ID: <87h9t0iam9.fsf@uwakimon.sk.tsukuba.ac.jp> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1427872468 24786 80.91.229.3 (1 Apr 2015 07:14:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 07:14:28 +0000 (UTC) Cc: Alan Mackenzie , 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 09:14:19 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 1YdCqx-0002U0-B6 for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 09:14:19 +0200 Original-Received: from localhost ([::1]:41851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdCqw-0003P8-Ew for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 03:14:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdCqs-0003P0-Sr for emacs-devel@gnu.org; Wed, 01 Apr 2015 03:14:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdCqn-0001dJ-TT for emacs-devel@gnu.org; Wed, 01 Apr 2015 03:14:14 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:41577) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdCqn-0001cs-KO for emacs-devel@gnu.org; Wed, 01 Apr 2015 03:14:09 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 13E8D1C382A; Wed, 1 Apr 2015 16:14:07 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id EF76B120EC9; Wed, 1 Apr 2015 16:14:06 +0900 (JST) In-Reply-To: <551B8DD0.1010800@math.ntnu.no> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184694 Archived-At: Harald Hanche-Olsen writes: > Stephen J. Turnbull wrote: > > Richard's repo is tangled *because* he, like you, doesn't commit until > > he's ready to push. > > That's overstating it; OK, I'll concede that it's overstatement to say that it has been proven to be the reason they have trouble. Still, it's a plausible line of argument to say that the longer the time between pulls, the more likely that a pull will cause a conflict *and* touch a lot of files. The number of files touched will only be visible to the user when there is a conflict, otherwise the merge is silent (unless the user directly investigates). In Richard's case, he testifies to weeks between pulls. I don't know how long Alan goes between pulls (where "how long" should be measured in number of others' commits or maybe number of files touched), but he's probably not close to Richard. So I admit this is hardly well-calibrated. > but Eli says he *should* pull before committing, so that can't be > the reason. Eli says it's OK to do so; AFAIK Eli is basically neutral towards others' preferred workflows. But I don't think Eli has a theory of git that says it's OK, just his own experience. But I rather doubt Eli goes more than a couple days between pulls, so he would be unlikely to see startling numbers of files touched, whereas Richard is likely to run into that if he does have conflict.