From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Robin Templeton Newsgroups: gmane.emacs.devel Subject: Re: master cbef1e9 2/3: ; make change-history-commit Date: Thu, 09 Apr 2015 18:35:25 -0400 Message-ID: <87y4m1rkuq.fsf@panthera.terpri.org> References: <20150409172246.20602.44549@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428618969 16470 80.91.229.3 (9 Apr 2015 22:36:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 9 Apr 2015 22:36:09 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 10 00:36:03 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 1YgL3K-0005JH-Cv for ged-emacs-devel@m.gmane.org; Fri, 10 Apr 2015 00:36:02 +0200 Original-Received: from localhost ([::1]:36818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgL3J-0002yY-PT for ged-emacs-devel@m.gmane.org; Thu, 09 Apr 2015 18:36:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgL3G-0002yI-6r for emacs-devel@gnu.org; Thu, 09 Apr 2015 18:35:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgL3C-0006by-3Z for emacs-devel@gnu.org; Thu, 09 Apr 2015 18:35:58 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:45160) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgL3B-0006bk-Sr for emacs-devel@gnu.org; Thu, 09 Apr 2015 18:35:54 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YgL3A-0005Et-7V for emacs-devel@gnu.org; Fri, 10 Apr 2015 00:35:52 +0200 Original-Received: from cpe-174-97-170-104.nc.res.rr.com ([174.97.170.104]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 10 Apr 2015 00:35:52 +0200 Original-Received: from robin by cpe-174-97-170-104.nc.res.rr.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 10 Apr 2015 00:35:52 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 28 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cpe-174-97-170-104.nc.res.rr.com User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) Cancel-Lock: sha1:9gdC8yEENVtNtUlzcSRZZvoRCxo= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:185236 Archived-At: Glenn Morris writes: > I had assumed that the ChangeLog would not be versioned at all now, > but it seems like it is? What's the point of that? > I assumed that only the corrections would be versioned, and the full > file would only appear in tarballs as a generated file. Versioning only the corrections would have some significant advantages. Under the new system, ChangeLogs are still the authoritative source of correct commit messages and it's still necessary to store redundant data in the repository. If only corrections to specific commits were stored, it would be possible to amend the log messages as viewed with git commands, perhaps using git object notes. Those who prefer the traditional file-based ChangeLog for browsing could always generate it themselves, and would also be possible to imitate the current log editing "user interface" without actually storing complete logs in the repository. Separating corrections could also completely eliminate ChangeLog merge conflicts. AFAICT, they can be avoided now only if all history editing is done on master and never in branches. -- Inteligenta persono lernas la lingvon Esperanton rapide kaj facile. Esperanto estas moderna, kultura lingvo por la mondo. Simpla, fleksebla, belsona, Esperanto estas la praktika solvo de la problemo de universala interkompreno. Lernu la interlingvon Esperanton!