public inbox for
 help / color / mirror / Atom feed
From: Andrew Cagney <>
To: Mark Wielaard <>
Cc: frysk <>
Subject: Re: Doing a vendor branch import and merge if libunwind
Date: Fri, 23 Nov 2007 19:29:00 -0000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

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.
> 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 hasn't been updated
> with the new changes.
> Cheers,
> Mark

      reply	other threads:[~2007-11-23 19:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-22 14:07 Mark Wielaard
2007-11-22 21:26 ` Andrew Cagney
2007-11-23 12:29   ` Mark Wielaard
2007-11-23 19:29     ` Andrew Cagney [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).