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. Thanks, --Vladimir On Wed, Mar 31, 2010 at 9:43 AM, Hirotsugu Asari <[email protected]> wrote: > OK, there is a split brain situation with JRuby's code base right now. > > On github, HEAD is > http://github.com/jruby/jruby/commit/93dcb708f51da895918c36d51de994e2e4be1575 > > But my checked-out copy from [email protected]:jruby.git has diverged from the > parent of the above commit, starting with Charlie's 067a95a. > > I'm not sure how we can resolve this problem. Hopefully someone else does. > --------------------------------------------------------------------- > To unsubscribe from this list, please visit: > > http://xircles.codehaus.org/manage_email > > > --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
