From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 14:43:21 +0200 Message-ID: <55212DE9.8070806@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428237825 23788 80.91.229.3 (5 Apr 2015 12:43:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 12:43:45 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 14:43:45 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 1Yejtv-0002KR-8Y for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 14:43:43 +0200 Original-Received: from localhost ([::1]:36276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yejtu-0002eb-O8 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 08:43:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yejtj-0002cU-IM for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:43:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yejtg-0007kF-0I for emacs-devel@gnu.org; Sun, 05 Apr 2015 08:43:31 -0400 Original-Received: from hylle05.itea.ntnu.no ([129.241.56.225]:60734) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yejtf-0007jH-QD; Sun, 05 Apr 2015 08:43:27 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id 8275C9010E2; Sun, 5 Apr 2015 14:43:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::6c00:a298:a5fc:6f32] (unknown [IPv6:2001:4662:4ffb:0:6c00:a298:a5fc:6f32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id AC2A690105E; Sun, 5 Apr 2015 14:43:23 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 129.241.56.225 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:184916 Archived-At: Richard Stallman wrote: > I know one way to get out of this. I can extract my changes by hand, > from the files ChangeLog says I had changed. Then I can delete this > repository and make another to use to install these changes. That is way too drastic. For one, if you run git diff f1cea3e dca743f then you will have all the changes you made since you checked out master=20 a long time ago (f1cea3e) until your third commit (dca743f) on March 22.=20 If I got it correctly, that is all the changes you have made, with the=20 exception of changes to lisp/ChangeLog. (But I am not sure you made no=20 other changes after that third commit. Are you?) That output of git diff should be suitable as an input to patch, if you=20 are so inclined. But I don't think it will come to that. As a last ditch=20 maneuver, though, consider this possibility: git reset --hard origin/master git pull git diff f1cea3e dca743f | patch -p1 # edit lisp/Changelog git commit -a git push (Though I think git has better builtin commands than the above pipeline=20 into patch; I just don't know them.) In any case, the reason I recommend that you commit in the situation you=20 are now in, is that it gives you much more freedom to explore the=20 situation. With uncommitted changes in the index and/or work tree, your=20 hands are tied to some extent (which is one reason git stash exists). > I could make another repository each time I need to install something. > But cvs was much more convenient. The usual answer to this is to use development branches instead of=20 workin directly in the master branch. I think it was decided not to=20 recommend these for simple workflows, but I don't think it is that much=20 harder, and it is certainly easier than having separate repositories. =E2=80=93 Harald