New canonical repo?

[stonehippo]

Ryan,

I see that you forked sinatra/sinatra from bmizerany/sinatra, as you
mentioned would happen a few posts ago. Is this now officially the new
canonical repository?

Thanks,
G

[Blake Mizerany]

Yes it is.  It's official. :)

--
Blake Mizerany
blake.m...@gmail.com

[Ryan Tomayko]

On 1/15/09 12:06 AM, Blake Mizerany wrote:

> On 1/14/09 11:12 PM, stonehippo wrote:
>> I see that you forked sinatra/sinatra from bmizerany/sinatra, as you
>> mentioned would happen a few posts ago. Is this now officially the new
>> canonical repository?
>

> Yes it is. It's official. :)

Well, there's ceremonies that need commencing and all that, but yeah :)

To add a bit more detail, the canonical repo URLs are:

http://github.com/sinatra/sinatra
git://github.com/sinatra/sinatra.git

This is the place to watch if you want to keep up on what's happening
for the upcoming release or run against bleeding edge Sinatra code. All
patches should be based on this repo's master branch. We'll be checking
for github pull requests every so often but the mailing list and
lighthouse are more closely monitored.

It's also worth noting that the bmizerany and rtomayko repos are now
likely to be much more volatile. Commits on those repos may change
before making their way into the canonical sinatra repo. I, for one, can
guarantee that I will be using `git push -f` to the rtomayko repo so
it's best not to base your branches there.

And finally, here's the general workflow I use for pushing to the
canonical sinatra repo when applying a patch from "joe":

git fetch sinatra (the canonical repo remote)
git remote add joe git://github.com/joe/sinatra.git
git fetch joe
git checkout -b joe joe/master
git rebase sinatra/master
(review, test, amend, etc.)
git push sinatra joe:master

The canonical repo will never lose ancestry or be force pushed.

Thanks,
Ryan