From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 24 Mar 2015 10:06:22 -0700 Organization: UCLA Computer Science Department Message-ID: <5511998E.8080309@cs.ucla.edu> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1427216820 15535 80.91.229.3 (24 Mar 2015 17:07:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 24 Mar 2015 17:07:00 +0000 (UTC) To: rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 24 18:06:51 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 1YaSHx-0005TB-9P for ged-emacs-devel@m.gmane.org; Tue, 24 Mar 2015 18:06:49 +0100 Original-Received: from localhost ([::1]:33597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaSHw-0007r1-Im for ged-emacs-devel@m.gmane.org; Tue, 24 Mar 2015 13:06:48 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaSHn-0007qO-99 for emacs-devel@gnu.org; Tue, 24 Mar 2015 13:06:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaSHi-0000b4-AC for emacs-devel@gnu.org; Tue, 24 Mar 2015 13:06:39 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:47680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaSHi-0000Tt-4G; Tue, 24 Mar 2015 13:06:34 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 6AF4339E801B; Tue, 24 Mar 2015 10:06:25 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ypkqy3dK1uBN; Tue, 24 Mar 2015 10:06:24 -0700 (PDT) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id D562339E8017; Tue, 24 Mar 2015 10:06:24 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 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:184162 Archived-At: On 03/24/2015 08:57 AM, Richard Stallman wrote: > C-x v v, when it commits changes, should also push them. Others have mentioned problems with that proposal. One other thing: I guess that the proposal arose from your hassles with a bad ChangeLog merge as discussed in the recent "git is screwed" thread. Similar hassles have occurred since we switched to git, and we do need something better here. I am planning to implement a different way of addressing these hassles, a way that doesn't suffer from the problems that others mentioned with altering C-x v v. The basic idea is that an ordinary commit logs their ChangeLog entries only in its commit message, so that ordinary commits do not need to alter or merge ChangeLog files. There is a process for generating and fixing up ChangeLogs, which can be done only as needed (e.g., just before a release). For details, please see the patch near the end of Bug#19113: http://bugs.gnu.org/19113#119 This patch works for me, and I plan to convert the Emacs master branch to it soon. I'll send emacs-devel a heads-up warning about it about a week before I make the change. It would be nice if others tested it, as everybody has their own habits when dealing with Git and I expect others will run into glitches after this is rolled out. (I hope the glitches are smaller than the hassles you've been dealing with....)