From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1948 invoked by alias); 23 Nov 2007 12:29:22 -0000 Received: (qmail 1941 invoked by uid 22791); 23 Nov 2007 12:29:21 -0000 X-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL,BAYES_00,DK_POLICY_SIGNSOME,FORGED_RCVD_HELO,WLS_URI_OPT_0 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; Fri, 23 Nov 2007 12:29:10 +0000 Received: from dijkstra.wildebeest.org ([192.168.1.29]) by gnu.wildebeest.org with esmtp (Exim 4.63) (envelope-from ) id 1IvXed-0006OX-Qa; Fri, 23 Nov 2007 13:29:08 +0100 Subject: Re: Doing a vendor branch import and merge if libunwind From: Mark Wielaard To: Andrew Cagney Cc: frysk In-Reply-To: <4745F3ED.4040107@redhat.com> References: <1195740451.2970.41.camel@dijkstra.wildebeest.org> <4745F3ED.4040107@redhat.com> Content-Type: text/plain Date: Fri, 23 Nov 2007 12:29:00 -0000 Message-Id: <1195820947.2981.31.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: -1.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/msg00170.txt.bz2 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. 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. 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