From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 83074 invoked by alias); 16 Mar 2015 01:14:45 -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 83065 invoked by uid 89); 16 Mar 2015 01:14:45 -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; Mon, 16 Mar 2015 01:14:44 +0000 Received: from [192.168.0.16] (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 20:14:40 -0500 Message-ID: <55062E7E.3010701@oarcorp.com> Date: Mon, 16 Mar 2015 01:14:00 -0000 From: Joel Sherrill User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Andreas Schwab CC: "gdb@sourceware.org" , Chris Johns Subject: Re: Cherry Picking git Patches and ChangeLog References: <550609D6.2020003@oarcorp.com> <874mplvq2i.fsf@igel.home> <87wq2huamh.fsf@igel.home> In-Reply-To: <87wq2huamh.fsf@igel.home> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes X-SW-Source: 2015-03/txt/msg00047.txt.bz2 On 3/15/2015 6:03 PM, Andreas Schwab wrote: > Joel Sherrill writes: > >> 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.=20 > Please explain what you are trying to do. Cherry picking will use the > configured merge driver. RTEMS has a Python based tool building framework similar to BSD ports. It has a "recipe" to build a package like gcc, binutils, or gdb. We usually start with a release tarball and apply patches. The patches can be from RTEMS which aren't ready to be upstreamed or not merged upstream. These patches are hosted on rtems.org in a special git repo. But once they are merged, we like to fetch them from the upstream repo or patch review system. In this case, the patch directly extracted from git on the head doesn't apply with patch to the contents of the release tarball. I didn't see an option to patch to exclude some files so it seems like the only option is to use git to cherry-pick the patches manually and create a patch set. We were trying to go directly from git/patchworks -> patch onto contents from tar file. Does that make sense? > Andreas. > --=20 Joel Sherrill, Ph.D. Director of Research & Development joel.sherrill@OARcorp.com On-Line Applications Research Ask me about RTEMS: a free RTOS Huntsville AL 35805 Support Available (256) 722-9985