From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 05:11:07 -0400 Message-ID: References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1428225084 6809 80.91.229.3 (5 Apr 2015 09:11:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 09:11:24 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 11:11:16 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 1YegaJ-0004Tx-76 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 11:11:15 +0200 Original-Received: from localhost ([::1]:35627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegaH-0005EC-KQ for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 05:11:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegaC-0005AC-OQ for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:11:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YegaB-0002dE-N5 for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:11:08 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:51981) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegaB-0002d7-Ks for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:11:07 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YegaB-0007HJ-18; Sun, 05 Apr 2015 05:11:07 -0400 In-reply-to: <5513F889.4000404@math.ntnu.no> (message from Harald Hanche-Olsen on Thu, 26 Mar 2015 13:16:09 +0100) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:184907 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] Having stashed my changes, I tried 'git pull'. It said that the merge failed and reported conflicts in lisp/ChangeLog. I fixed those by hand, and tried various ways to proceed from there. I tried to commit lisp/ChangeLog with C-x v v in that file and got an error that partial commits are not allowed in the middle of a merge. You had recommended git add lisp/ChangeLog git commit so I tried that. git add completed with no output. git commit showed me a monster list of files with changes to be committed, and asked me for the log message. I killed it. What next? 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. I could make another repository each time I need to install something. But cvs was much more convenient. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.