[Buildbot-devel] github workflow for Buildbot source tree
clepple at gmail.com
Thu Feb 4 13:02:52 UTC 2010
On Feb 4, 2010, at 12:25 AM, Dustin J. Mitchell wrote:
> On Wed, Feb 3, 2010 at 10:24 PM, Charles Lepple <clepple at gmail.com>
>> I'm trying out github, and I was going to create a new branch to
>> some changes.
>> However, I "forked" djmitche/buildbot a few days ago, and my changes
>> are small enough that, if I were working locally, I would just rebase
>> rather than merge. I tried rebasing a doc change onto a later version
>> of djmitche/buildbot/master, and GitHub refused my "git push" of my
>> branch, since it wasn't a fast-forward. I created a new branch, and
>> pushed that, and now I get a 404 for http://github.com/clepple/
>> buildbot (I'm hoping that last part was mere coincidence).
> Yeah, github is having some hardware problems right now:
> You don't have push permission to my repository, so you can use push
> -f (force) rather indiscriminately, even on master. However, it is
> quite helpful if you push your development to named branches in your
> github repo. That way, if you push several improvements, we don't
> have to try to sort out which commits on master represent each
Right, I assumed I didn't have push permission to your repository, but
I didn't make it clear that after rebasing onto your master, I was
trying to push into a branch in my GitHub repository.
I guess the GitHub non-fast-forward hook message sounded a little more
dire than usual.
>> At this point, I'm having a bit of trouble separating what seems to
>> expected behavior with github, versus unexpected behavior due to
>> github downtime.
> As far as I can tell, the Git interface to github is working fine
> right now - just not the web interface.
Yup, the branch did show up this morning.
Thanks for the clarification!
More information about the devel