On Wed, Mar 31, 2010 at 3:15 AM, Vladimir Sizikov <[email protected]> wrote:
> Yep, indeed. The two repos have diverged. The only explanation I have
> is that MenTaLguY had committed to github repo directly, while we
> typically commit to jruby.org one. And since then, it became
> impossible to "sync" jruby.org repo with github one.
>
> I'd say that we probably need to close github repo for regular commits
> to avoid similar problems in the future, and allow only sync-ups from
> jruby.org to go into github repo.
>
> As the solution for the current problem, one way to do that is to save
> MenTaLguY's commit somewhere first, then *rewrite* the history of
> github repo to restore it to earlier state (yeah, rewriting of public
> branches is not good, but what else can we do here?), and then the
> sync-up would start working. And then commit MenTaLguY's commit back,
> but into jruby.org repository.
No need to rewrite, I just merged github/master into master, pushed to
jruby.org, and all is well again.
/Nick
---------------------------------------------------------------------
To unsubscribe from this list, please visit:
http://xircles.codehaus.org/manage_email
