From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [PATCH v2 0/5] fixes for w32 and NetPBM Date: Fri, 01 Nov 2013 13:24:45 +0200 Message-ID: <83ob64bc02.fsf@gnu.org> References: <878uxbylo5.wl%claudio.bley@gmail.com> <8338ngcwp3.fsf@gnu.org> <87d2mkz9w0.wl%claudio.bley@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1383305112 24186 80.91.229.3 (1 Nov 2013 11:25:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Nov 2013 11:25:12 +0000 (UTC) Cc: emacs-devel@gnu.org To: Claudio Bley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 01 12:25:16 2013 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 1VcCqn-0004dG-PW for ged-emacs-devel@m.gmane.org; Fri, 01 Nov 2013 12:25:13 +0100 Original-Received: from localhost ([::1]:37259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VcCqn-0006sJ-Bu for ged-emacs-devel@m.gmane.org; Fri, 01 Nov 2013 07:25:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VcCqg-0006lU-2E for emacs-devel@gnu.org; Fri, 01 Nov 2013 07:25:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VcCqa-00078W-U9 for emacs-devel@gnu.org; Fri, 01 Nov 2013 07:25:05 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:62605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VcCqa-00076V-LP for emacs-devel@gnu.org; Fri, 01 Nov 2013 07:25:00 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0MVL00700107U100@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 01 Nov 2013 13:24:59 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MVL0078611MNX50@a-mtaout20.012.net.il>; Fri, 01 Nov 2013 13:24:59 +0200 (IST) In-reply-to: <87d2mkz9w0.wl%claudio.bley@gmail.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:164796 Archived-At: > Date: Fri, 01 Nov 2013 11:36:31 +0100 > From: Claudio Bley > Cc: emacs-devel@gnu.org > > > In the future, please also provide ChangeLog entries for your > > changes. (I wrote them this time.) > > OK, will do. But, I'm curious, how do you cope with the merge > conflicts popping up for each patch? Do you resolve them manually each > time? There are no ChangeLog merge conflicts, not with bzr. Bzr resolves ChangeLog issues automatically. Anyway, you don't need to send the log entries as diffs, you can just send them as part of the text portion of your patch. Copy/yank is simple enough.