From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30777 invoked by alias); 22 Nov 2007 21:26:11 -0000 Received: (qmail 30769 invoked by uid 22791); 22 Nov 2007 21:26:10 -0000 X-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00,DK_POLICY_SIGNSOME,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 22 Nov 2007 21:26:06 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.1) with ESMTP id lAMLQ3xf002261; Thu, 22 Nov 2007 16:26:03 -0500 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [10.11.255.20]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id lAMLQ3WO015403; Thu, 22 Nov 2007 16:26:03 -0500 Received: from [127.0.0.1] (sebastian-int.corp.redhat.com [172.16.52.221]) by pobox.corp.redhat.com (8.13.1/8.13.1) with ESMTP id lAMLQ2lf009674; Thu, 22 Nov 2007 16:26:03 -0500 Message-ID: <4745F3ED.4040107@redhat.com> Date: Thu, 22 Nov 2007 21:26:00 -0000 From: Andrew Cagney User-Agent: Thunderbird 1.5.0.12 (X11/20070530) MIME-Version: 1.0 To: Mark Wielaard CC: frysk Subject: Re: Doing a vendor branch import and merge if libunwind References: <1195740451.2970.41.camel@dijkstra.wildebeest.org> In-Reply-To: <1195740451.2970.41.camel@dijkstra.wildebeest.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2007-q4/txt/msg00165.txt.bz2 Mark Wielaard wrote: > Hi, > > Since there was an somewhat important memory clobbering patch in > upstream libunwind I decided to refresh our libunwind copy. And since > the patch was so small (the rest was really stuff we already had in our > tree, but were not also upstream) I hoped this was easy. It was a bit of > a struggle though, but mostly because I don't know git enough. Here is > what I did. Comments on how to improve this process appreciated. > > - Get the libunwind vendor branch > $ git-checkout vendor/LIBUNWIND > Perhaps instead of "remove"; "replace" > - Remove old stuff > $ rm -rf frysk-import/libunwind > - Get upstream stuff and put it in > (make sure you don't accidentially copy over the upstream .git dir) > $ cp -r ~/upstream/libunwind frysk-import/ > - Commit (use a commit messsage like "Import of libunwind version > libunwind-20071122") and push > $ git-commit -a && git-push > > The vendor branch is now updated > > - Merge to the trunk > $ git-checkout master > $ git-merge vendor/LIBUNWIND > - Resolve the conflicts using git-rm for files not needed, > editing files with conflict markers and git-add each one after > resolving the issues. > - Do a full clean build and double check the test results. > [.. lots of time passes...] > - Commit and push the result (git will have generated a merge message > for you already that you can use in the commit). > $ got commit && git push > > If too much time has passed since the start the push will fail. Trying > to do a git fetch origin; git rebase origin seem to fail, so you have to > just do a git pull && git push then (which creates an extra merge > message, but that seems just fine). > > If we have a good workflow we should update the webpages. > Thanks to Tim for helping me out when I got stuck on irc. > > Please don't hold back here; this is clearly far better than what we have now; so should replace what we have now Andrew