From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 37663 invoked by alias); 19 Feb 2019 13:13:42 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 37646 invoked by uid 89); 19 Feb 2019 13:13:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=UD:wildebeest.org, dnf X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.143.4) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 19 Feb 2019 13:13:39 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 7F7B2232637 for ; Tue, 19 Feb 2019 07:13:38 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id w5DOg2hUj4FKpw5DOgM4nQ; Tue, 19 Feb 2019 07:13:38 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HSrUeLv2WKsO9k+ECYofyJQsPDa4XGgadh5GsuOTl00=; b=e8rFbKABpZriHfFHCYu7koqw84 293F7bgBgMufk4A/jjRhGnPJCIwtYIgJV8lGHaLwD67UPyk9NJra8eSX6atkluUXhdld++8aLzaRb IDPNae6RzE6TtUbXWkC1iuKia; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:33110 helo=murgatroyd) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gw5DO-001Rn6-76; Tue, 19 Feb 2019 07:13:38 -0600 From: Tom Tromey To: Joel Brobecker Cc: Tom Tromey , gdb-patches@sourceware.org Subject: Re: [PATCH] Minor Ada task cleanups References: <20190215212253.25409-1-tromey@adacore.com> <20190217145708.GC8537@adacore.com> Date: Tue, 19 Feb 2019 13:13:00 -0000 In-Reply-To: <20190217145708.GC8537@adacore.com> (Joel Brobecker's message of "Sun, 17 Feb 2019 18:57:08 +0400") Message-ID: <87bm37vs3i.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2019-02/txt/msg00301.txt.bz2 >>>>> "Joel" == Joel Brobecker writes: Joel> One question independent of this patch first: I am wondering - how Joel> do you deal with submissions that you want to "git am" but have Joel> a ChangeLog patch in it that cause a merge failure? This was a bug in my script to send email -- it failed to remove the ChangeLog hunk when sending from a git worktree. I've just fixed it. You can see my scripts here: https://github.com/tromey/git-gnu-changelog For the case of applying a patch, I use git-merge-changelog, from gnulib. Fedora packages it so you can just "dnf install" it. This avoids most problems arising from applying patches with ChangeLogs (I think I had one problem in the last few years). Mark once wrote up some instructions that I still follow when setting this up: https://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/ Tom