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: Sat, 04 Apr 2015 18:28:50 +0300 Message-ID: <83sicfoqtp.fsf@gnu.org> References: <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> <86bnj59rjj.fsf@dod.no> <83wq1snd0k.fsf@gnu.org> <86vbhb9auh.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428161357 23896 80.91.229.3 (4 Apr 2015 15:29:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 15:29:17 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 17:29:09 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 1YeQ0R-0002Af-UC for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 17:29:08 +0200 Original-Received: from localhost ([::1]:33444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeQ0R-0000rd-3u for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 11:29:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeQ0F-0000rW-Ta for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:28:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeQ0C-00064f-JC for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:28:55 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:39245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeQ0C-00064W-CK for emacs-devel@gnu.org; Sat, 04 Apr 2015 11:28:52 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NMA00100G1KWO00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:28:50 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMA001J2GC2R680@a-mtaout20.012.net.il>; Sat, 04 Apr 2015 18:28:50 +0300 (IDT) In-reply-to: <86vbhb9auh.fsf@dod.no> 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:184872 Archived-At: > From: Steinar Bang > Date: Sat, 04 Apr 2015 17:23:02 +0200 > > >>>>> Eli Zaretskii : > > > The same you did with CVS: just pull. In most cases, this should > > "just work". It might fail if there are conflicts with stuff you pull > > from upstream, in which case you should resolve the conflicts (like > > you did with CVS). > > Note that git will refuse to pull if there are uncommitted changes in > any of the files touched by the pull. I think it will succeed in fetching, and then refuse to merge. But the way to handle this is the same as if the conflicted changes are committed: fix the conflicts, and then "git pull" again. Right? > So in the minimal CVS-like workflow either one need to extend that > workflow to use stash in some cases, or one need to keep committing > files/changesets until the pull is able to succeed. I'd like to avoid stashing in the CVS-like workflow, if at all possible.