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: Tue, 31 Mar 2015 18:50:11 +0300 Message-ID: <83zj6trwss.fsf@gnu.org> References: <86egoeusg2.fsf@example.com> <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> <551ABE91.4020408@math.ntnu.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1427817067 8141 80.91.229.3 (31 Mar 2015 15:51:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 15:51:07 +0000 (UTC) Cc: schwab@suse.de, stephen@xemacs.org, rms@gnu.org, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 17:50:56 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 1YcyRM-0005Xv-1v for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 17:50:56 +0200 Original-Received: from localhost ([::1]:39319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcyRL-0006yM-9Q for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 11:50:55 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcyQu-0006y3-SF for emacs-devel@gnu.org; Tue, 31 Mar 2015 11:50:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcyQq-0007VX-6n for emacs-devel@gnu.org; Tue, 31 Mar 2015 11:50:28 -0400 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:52095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcyQp-0007VM-Vk; Tue, 31 Mar 2015 11:50:24 -0400 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NM300O002GX9I00@mtaout28.012.net.il>; Tue, 31 Mar 2015 18:49:04 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM300EL82LSZP80@mtaout28.012.net.il>; Tue, 31 Mar 2015 18:49:04 +0300 (IDT) In-reply-to: <551ABE91.4020408@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.184 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:184651 Archived-At: > Date: Tue, 31 Mar 2015 17:34:41 +0200 > From: Harald Hanche-Olsen > Cc: stephen@xemacs.org, Richard Stallman , emacs-devel= @gnu.org >=20 > Andreas Schwab wrote: > > Richard Stallman writes: > > > >> It usually takes weeks from when I write a change to when I chec= k it > >> in to Savannah. To check them in, I must first get the latest c= hanges > >> from Savannah. If I can't do a pull in that state, how can I ev= er > >> check them in? > > > > Check them in, then pull. It's as simple as that. >=20 > But Richard just said that =E2=80=9Cchecking in=E2=80=9D=E2=80=9A t= o him, means putting it in=20 > the central repository. >=20 > A better phrasing is: Commit, then pull. No, it's better for Richard to pull, then checkin. That's closer to what he is used to, and even if there's trouble (pull fails due to uncommitted changes), that trouble is closer in spirit to what he would have in a similar situation with CVS and bzr, so it would be easier for him to understand the situation and fix it.