From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 17:26:41 +0300 Message-ID: <551AAEA1.30108@yandex.ru> 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> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <86ego5qoj1.fsf@example.com> <838uedtg47.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1427812029 15424 80.91.229.3 (31 Mar 2015 14:27:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 14:27:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii , Sebastien Vauban Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 16:26:58 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 1Ycx80-00066e-6R for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 16:26:52 +0200 Original-Received: from localhost ([::1]:38996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycx7z-0001s8-Kg for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:26:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycx7w-0001s3-Mh for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:26:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycx7t-0003SV-DR for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:26:48 -0400 Original-Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:37321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycx7t-0003SQ-6p; Tue, 31 Mar 2015 10:26:45 -0400 Original-Received: by wiaa2 with SMTP id a2so28368340wia.0; Tue, 31 Mar 2015 07:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=m+Q04lomdItd7IOkEKM4/3Svp9f/wAw32XSdkHrOVLc=; b=FrJB4mOQ5yCDvgxxmH0BOAiwTT29yA90V+/jd7QTTq2eBNYoZ1MxqZwnosoKCHTPuO PilidL8FptB4GcFKy05JWKnAfgwf6YfZqgRZQMqevrkPm+x794afBKP6LjKDUKH2nRD+ c0tMtwqwaQViGeT8HQA8e9hl2ZEr4sGwtn3zvR6cHJ826LX8kUi0Dnsm67Q3rHffXtZW evffqwxzHKjLVdTaXu68CWrgovWi7qKtSZn94nnw+C7bz08r705c0xS8YqkE5ZiQifS6 CiIffeCENdjIYFOeOIGR7zZTQGvNEbyJQMjjwIFCg/13h5qsW4/y11iZjb/D/VuhzZBt r50g== X-Received: by 10.194.60.173 with SMTP id i13mr73056717wjr.124.1427812004591; Tue, 31 Mar 2015 07:26:44 -0700 (PDT) Original-Received: from [192.168.1.3] ([82.102.93.54]) by mx.google.com with ESMTPSA id q10sm20586734wjr.41.2015.03.31.07.26.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Mar 2015 07:26:43 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: <838uedtg47.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::230 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:184635 Archived-At: On 03/31/2015 05:07 PM, Eli Zaretskii wrote: > Nothing, IME. Contrary to the cited text, "git pull" with uncommitted > changes doesn't fail. I do this every time before committing a > changeset I intend to push, and it always worked for me. Neither is exactly true. Since 1.7.0 or so, "git pull" with uncommitted changes can succeed if the newly pulled changes don't touch the locally changed files, but will fail otherwise. Which makes a lot of sense. > By contrast, if you do commit, and _then_ pull, your pull might fail > to merge the new stuff from upstream, and _then_ you'd need to do > something to fix that. If your local changes didn't touch the same files that were changed upstream, there shouldn't be any conflicts, aside from ChangeLog-related ones. Which should become no problem soon. > (I usually just "git reset HEAD^" and pull > again, then commit my changes again, after fixing the ChangeLog > entries to be in the correct order.) I'd usually rebase (as long as there haven't been any local merges), but that's not something we can put in the common workflow, of course.