From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25353 invoked by alias); 22 Nov 2007 14:07:42 -0000 Received: (qmail 25236 invoked by uid 22791); 22 Nov 2007 14:07:40 -0000 X-Spam-Status: No, hits=-0.9 required=5.0 tests=AWL,BAYES_40,DK_POLICY_SIGNSOME,FORGED_RCVD_HELO X-Spam-Check-By: sourceware.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (83.160.170.119) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 22 Nov 2007 14:07:35 +0000 Received: from dijkstra.wildebeest.org ([192.168.1.29]) by gnu.wildebeest.org with esmtp (Exim 4.63) (envelope-from ) id 1IvCiJ-0005KX-M4 for frysk@sources.redhat.com; Thu, 22 Nov 2007 15:07:32 +0100 Subject: Doing a vendor branch import and merge if libunwind From: Mark Wielaard To: frysk Content-Type: text/plain Date: Thu, 22 Nov 2007 14:07:00 -0000 Message-Id: <1195740451.2970.41.camel@dijkstra.wildebeest.org> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 (2.12.1-3.fc8) Content-Transfer-Encoding: 7bit X-Spam-Score: -4.4 (----) 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/msg00162.txt.bz2 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 - 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. Cheers, Mark