From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: The ChangeLog and merge conflicts Date: Mon, 9 Feb 2015 23:36:44 +0000 Message-ID: References: Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c3251e3338ee050eb03e51 X-Trace: ger.gmane.org 1423525013 6439 80.91.229.3 (9 Feb 2015 23:36:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Feb 2015 23:36:53 +0000 (UTC) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 10 00:36:53 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 1YKxsp-0001i8-8Y for ged-emacs-devel@m.gmane.org; Tue, 10 Feb 2015 00:36:51 +0100 Original-Received: from localhost ([::1]:35780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKxsn-0001dk-W4 for ged-emacs-devel@m.gmane.org; Mon, 09 Feb 2015 18:36:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKxsk-0001dQ-5j for emacs-devel@gnu.org; Mon, 09 Feb 2015 18:36:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKxsj-00063q-Am for emacs-devel@gnu.org; Mon, 09 Feb 2015 18:36:46 -0500 Original-Received: from mail-ob0-x236.google.com ([2607:f8b0:4003:c01::236]:57842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKxsj-00063g-65 for emacs-devel@gnu.org; Mon, 09 Feb 2015 18:36:45 -0500 Original-Received: by mail-ob0-f182.google.com with SMTP id nt9so28068716obb.13 for ; Mon, 09 Feb 2015 15:36:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:content-type; bh=TIkBifbodke5UiTfb9x7Mo49tbJuo4EH4lo/rLpNo4A=; b=N6G0ma0J5LGEL+WTTTCoewpiewhBaYj57UHJPa86tj4O/YrDJ1czSPDYTxCTjfPYP2 SfJsoqZoH5ywjoirmhbF13XMVedPH0iTR6oB50jaxu08yJmbrUxIDn2mQ5tM0oQG0Kgq xdi0CiTNssyWkz1nySTDC1AeLBR5V5/z9La26I1C9wRB1gW3OCPSTXpTVT0cl6i9YAv/ eaUCvtM9luNWEq+jRwpH5OEzTYd/3D6TBSIjqrGrXXgFW72W0mHIqydGOcCPeScHrlhf YmFbeiNsGNm8YJXrNaACid4sWvQbi+v0+0zjEm1PlyYcua8hsW9eec/zu6xi43Fc5hGo 8Irg== X-Received: by 10.182.230.165 with SMTP id sz5mr13762989obc.29.1423525004128; Mon, 09 Feb 2015 15:36:44 -0800 (PST) Original-Received: by 10.76.125.1 with HTTP; Mon, 9 Feb 2015 15:36:44 -0800 (PST) Original-Received: by 10.76.125.1 with HTTP; Mon, 9 Feb 2015 15:36:44 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: JWR-M_u4UxPoy1S4uoJ3Ptn_YrU X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c01::236 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:182761 Archived-At: --001a11c3251e3338ee050eb03e51 Content-Type: text/plain; charset=UTF-8 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. Cheers, Artur --001a11c3251e3338ee050eb03e51 Content-Type: text/html; charset=UTF-8

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.

Cheers,
Artur

--001a11c3251e3338ee050eb03e51--