From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15677 invoked by alias); 23 Nov 2007 19:29:07 -0000 Received: (qmail 15669 invoked by uid 22791); 23 Nov 2007 19:29:07 -0000 X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,DK_POLICY_SIGNSOME,SPF_HELO_PASS,SPF_PASS,WLS_URI_OPT_0 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; Fri, 23 Nov 2007 19:28:56 +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 lANJSrlx017764; Fri, 23 Nov 2007 14:28:53 -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 lANJSrDA010461; Fri, 23 Nov 2007 14:28:53 -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 lANJSq9K030584; Fri, 23 Nov 2007 14:28:53 -0500 Message-ID: <474729F7.7010900@redhat.com> Date: Fri, 23 Nov 2007 19:29: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> <4745F3ED.4040107@redhat.com> <1195820947.2981.31.camel@dijkstra.wildebeest.org> In-Reply-To: <1195820947.2981.31.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/msg00174.txt.bz2 Mark Wielaard wrote: > Hi Andrew, > > On Thu, 2007-11-22 at 16:26 -0500, Andrew Cagney wrote: > >>> 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 >> > > Yeah, you are right. I was just holding back since I am not sure this is > really the best workflow. But it does seem to work. So I cleaned up the > working a bit and added it to the end of htdocs/build/git-fu.html. > > Thanks. > Please update and expand if you know a better way to do it. > > The thing you don't record now in git is the 'extra fixes needed for > this new import' step. I am not sure you can actually do that nicely, > because if you commit immediately after the merge to trunk, but before > you fix things up to resolve either conflicts or new stuff needed to > compiler/run correctly you are left with a commit that won't > compiler/run the tests correctly, which is bad if someone really wants > to use bisect for example. > > Nurdin handled this by doing the merge onto a branch cut from mainline. Once all was resolved he merged that. > I pushed the git-fu.html change, but that did give me an error (I assume > from the server): "/git/frysk.git/hooks/update-htdocs: line 21: > git-archive: command not found" > And http://sourceware.org/frysk/build/git-fu.html hasn't been updated > with the new changes. > > Cheers, > > Mark > >