From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: The ChangeLog and merge conflicts Date: Tue, 10 Feb 2015 01:05:30 +0100 Message-ID: <871tlytyut.fsf@fencepost.gnu.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1423526759 32292 80.91.229.3 (10 Feb 2015 00:05:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 10 Feb 2015 00:05:59 +0000 (UTC) Cc: emacs-devel To: Artur Malabarba Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 10 01:05:59 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 1YKyL0-0003n9-SI for ged-emacs-devel@m.gmane.org; Tue, 10 Feb 2015 01:05:59 +0100 Original-Received: from localhost ([::1]:35839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKyKz-0007mh-Vv for ged-emacs-devel@m.gmane.org; Mon, 09 Feb 2015 19:05:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKyKb-0007lk-D1 for emacs-devel@gnu.org; Mon, 09 Feb 2015 19:05:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKyKZ-0006JL-Vl for emacs-devel@gnu.org; Mon, 09 Feb 2015 19:05:33 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKyKZ-0006JD-IV for emacs-devel@gnu.org; Mon, 09 Feb 2015 19:05:31 -0500 Original-Received: from localhost ([127.0.0.1]:46804 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKyKZ-0007by-3H; Mon, 09 Feb 2015 19:05:31 -0500 Original-Received: by lola (Postfix, from userid 1000) id A8932E0514; Tue, 10 Feb 2015 01:05:30 +0100 (CET) In-Reply-To: (Artur Malabarba's message of "Mon, 9 Feb 2015 23:36:44 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) 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:182763 Archived-At: Artur Malabarba writes: > For this short period of time that I've been trying to help here, there is > one workflow issue that's really been bugging me: the ChangeLog file causes > conflicts on every merge. > > This pops up in two situations: > > 1. I do some work on another branch for a couple of days, while adding a > ChangeLog entry with each commit. I proceed to merge with master. > > 2. Someone submits a patch and is kind enough to include a ChangeLog entry > in it. As usual, the patch is only applied after (in the very least) a few > days. > > If anything at all has happened between branch/patch creation and the > merge, a conflict is guaranteed to happen. > Of course, the reason for this is that every new entry goes at the top of > the ChangeLog, and every commit is accompanied with an entry. > > I'm just wondering whether there's a solution around this that I'm not > aware of. Is there something I should do differently? > > These conflicts aren't complicated at all to solve, but it gets irritating > to have to fix them every single time. Take a look for the git-merge-changelog program (the respective Debian package is called just that). It's still sort of a nuisance to maintain the corresponding entry in the top level .gitattributes file (since it is itself under version control), but at least this works reasonably well for the non-toplevel ChangeLog file merges. -- David Kastrup