From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 62208 invoked by alias); 15 Mar 2015 22:46:48 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 62189 invoked by uid 89); 15 Mar 2015 22:46:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: OARmail.OARCORP.com Received: from oarmail.oarcorp.com (HELO OARmail.OARCORP.com) (67.63.146.244) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 15 Mar 2015 22:46:47 +0000 Received: from [192.168.0.8] (24.96.88.41) by OARmail.OARCORP.com (192.168.2.2) with Microsoft SMTP Server (TLS) id 8.3.342.0; Sun, 15 Mar 2015 17:46:43 -0500 User-Agent: K-9 Mail for Android In-Reply-To: <874mplvq2i.fsf@igel.home> References: <550609D6.2020003@oarcorp.com> <874mplvq2i.fsf@igel.home> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Subject: Re: Cherry Picking git Patches and ChangeLog From: Joel Sherrill Date: Sun, 15 Mar 2015 22:46:00 -0000 To: Andreas Schwab CC: "gdb@sourceware.org" ,Chris Johns Message-ID: X-IsSubscribed: yes X-SW-Source: 2015-03/txt/msg00045.txt.bz2 On March 15, 2015 5:44:21 PM CDT, Andreas Schwab wrote: >Joel Sherrill writes: > >> I know that this is really a git/ChangeLog/patch question but >> since it comes up in context of gdb, I am asking here. How >> does one deal with patches that would apply cleanly except >> for ChangeLog? > >git-merge-changelog can help here. That will help if we want to manually touch the patches and update them for the tarball. Ideally we would just reference the upstream patch directly in the build system and let patch do it. We want this to be done as part of users building tools from source. >Andreas. --joel