From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28444 invoked by alias); 22 Aug 2007 21:45:21 -0000 Received: (qmail 28375 invoked by uid 22791); 22 Aug 2007 21:45:20 -0000 X-Spam-Status: No, hits=-2.4 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; Wed, 22 Aug 2007 21:45:19 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.1/8.13.1) with ESMTP id l7MLjGLL002733 for ; Wed, 22 Aug 2007 17:45:16 -0400 Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com [172.16.14.4]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l7MLjFYb014460 for ; Wed, 22 Aug 2007 17:45:16 -0400 Received: from [10.11.14.9] (vpn-14-9.rdu.redhat.com [10.11.14.9]) by pobox.toronto.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id l7MLjFkn015896 for ; Wed, 22 Aug 2007 17:45:15 -0400 Message-ID: <46CCAE6A.3000904@redhat.com> Date: Wed, 22 Aug 2007 21:45:00 -0000 From: Sami Wagiaalla User-Agent: Thunderbird 2.0.0.5 (X11/20070719) MIME-Version: 1.0 To: frysk Subject: elfutils import 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-q3/txt/msg00328.txt.bz2 I have tagged the frysk source with: pre-elfutils_0_129-merge Imported elfutils 0.129 under the branch: elfutils_0_129 But have not merged it with the main trunk yet, as there are some test failures. To get a merged version of the tree I do this: cvs -d:ext:swagiaal@sources.redhat.com:/cvs/frysk checkout -j elfutils_0_127 -j elfutils_0_129 frysk I then resolve all the conflicts by blindly favoring upstream.