I now have a new assaf/buildr repository. My local repository has three remotes:
* origin is assaf/buildr so I can work on my own branches * upstream is buildr/buildr to synchronize/update the town hall repo * svn pointing to svn.eu so I can push directly to SVN Unless you're a committer, you can live with a simpler setup: * origin pointing to your fork where you can do whatever you want * upstream pointing to buildr/buildr so you can git pull updates Assaf On Tue, Mar 3, 2009 at 9:24 AM, Assaf Arkin <[email protected]> wrote: > On Tue, Mar 3, 2009 at 8:42 AM, Daniel Spiewak <[email protected]>wrote: > >> Hmm, I'm almost certain that I'm not a collaborator on buildr/buildr. (am >> I?) I did used to have a fork of vic/buildr, but that has been deleted. >> I >> could actually fork off of assaf/buildr, but I would rather fork from the >> main. >> >> I thought all the magic was already worked. :-) What else is left? > > > That was in reference to *don't fork/clone my repository*. > > I'm going to nuke and replace mine now. > > Assaf > > >> >> >> Daniel >> >> On Tue, Mar 3, 2009 at 10:36 AM, Assaf Arkin <[email protected]> wrote: >> >> > On Tue, Mar 3, 2009 at 8:19 AM, Daniel Spiewak <[email protected]> >> > wrote: >> > >> > > For some reason, I cannot GitHub fork the buildr/buildr repository. >> Any >> > > idea why this would be? >> > >> > >> > Neither can I, and there could be two reasons for that: >> > >> > a) You can't have two forks with the same name, so if you forked >> > vic/buildr >> > you can't also fork buildr/buildr. >> > b) You're a contributor on the project, apparently you can't fork a >> > project >> > you're contributing on. >> > >> > Meanwhile best thing to do is *not* fork or clone my repository, but >> wait a >> > couple of days for Victor to work his magic. >> > >> > Assaf >> > >> > >> > > >> > > >> > > Daniel >> > > >> > > On Tue, Mar 3, 2009 at 10:02 AM, Victor Hugo Borja < >> [email protected] >> > > >wrote: >> > > >> > > > I'm on it [1], it would eventually become the town-hall git >> repository, >> > > it >> > > > was based on Jukka's mirror, using the same authors file. I'm >> working >> > on >> > > > updating the aliases on buildr-git.rb. You can clone it an start >> > rebasing >> > > > your experimental branches on it. >> > > > >> > > > ruby -ropen-uri -e 'eval(open(" >> > > > >> > > >> > >> http://svn.apache.org/viewvc/buildr/trunk/doc/scripts/buildr-git.rb?view=co >> > > > ").read)' >> > > > >> > > > The intent of [1] instead of using vic/buildr is that I'd like [1] >> to >> > be >> > > an >> > > > exact mirror of what is in Apache SVN (including trunk, branches, >> > tags), >> > > > and >> > > > use my vic/buildr for my experiments, so that you don't have to pull >> my >> > > > insane code unless you want. >> > > > >> > > > Also I think we could use github.com/buildr to host plugins people >> > > develop >> > > > and maintain, but that not necessarily need to be part of the >> official >> > > > Buildr source base. When some code looks like must be in buildr's >> > trunk, >> > > we >> > > > can always create a JIRA issue, giving ASF permission to include the >> > > code, >> > > > and then merge with trunk. >> > > > >> > > > I've added Buildr commiters as collaborators on [1] so they can >> > > synchronize >> > > > manually whenever they want, I'm just waiting for the git aliases to >> be >> > > > ready. >> > > > >> > > > [1] http://github.com/buildr/buildr >> > > > >> > > > >> > > > On Tue, Mar 3, 2009 at 9:44 AM, Daniel Spiewak <[email protected] >> > >> > > > wrote: >> > > > >> > > > > Vic's mirror is only updated against the incubator repository. >> It's >> > > > > actually up to date with respect to that repository, but Buildr >> has >> > > since >> > > > > moved to a top level Apache project. This means that the git >> clones >> > > have >> > > > > to >> > > > > be rebuilt, and everybody with experimental branches will need to >> > > rebase >> > > > > (see thread "Welcome to Rebase Hell!" on the users list). >> > > > > >> > > > > I'm currently working off of Assaf's clone ( >> > > > http://github.com/assaf/buildr >> > > > > ), >> > > > > which should be up to date with the canonical SVN. Eventually, >> AFAIK >> > > the >> > > > > plan is to rebuild Vic's clone based on the new SVN and keep it >> > > > > automatically updated as before. Hopefully that rebuild start's >> from >> > > > > Assaf's, avoiding the need to rebase *again*. :-) >> > > > > >> > > > > Daniel >> > > > > >> > > > > On Tue, Mar 3, 2009 at 9:28 AM, Stephen Bannasch < >> > > > > [email protected]> wrote: >> > > > > >> > > > > > I saw that Alexis's git integration patch was applied because I >> was >> > > > > > watching: >> > > > > > >> > > > > > https://issues.apache.org/jira/browse/BUILDR-222 >> > > > > > >> > > > > > I have a git clone of Vic's git mirror of buildr: >> > > > > > >> > > > > > http://github.com/vic/buildr/tree/master >> > > > > > >> > > > > > and opened my up-to-date clone in GitX to see what the patch >> looked >> > > > like >> > > > > > but it wasn't there. >> > > > > > >> > > > > > Vic's github mirror of the svn repo: >> > > > > > >> > > > > > http://svn.apache.org/repos/asf/buildr >> > > > > > >> > > > > > is described on the Buildr site here: >> > > > > > >> > > > > > http://buildr.apache.org/contributing.html#git >> > > > > > >> > > > > > doesn't appear to be being updated. >> > > > > > >> > > > > > The last commit on the mirror is Assaf's commit from svn rev >> > 735108: >> > > > > > >> > > > > > >> > > > > > >> > > > > >> > > > >> > > >> > >> http://github.com/vic/buildr/commit/e35bc0fe8a0309d4cfdfb980af61cdb6f1a9990c >> > > > > > >> > > > > > And adapted RubyForge task accordingly >> > > > > > >> > > > > > git-svn-id: >> > > > > > https://svn.apache.org/repos/asf/incubator/buildr/tr...@735108 >> > > > > > 13f79535-47bb-0310-9956-ffa450edef68 >> > > > > > >> > > > > > I've setup git mirror's of svn repos and use svn post-commit >> hooks >> > to >> > > > > > initiate an update of the a private intermediate git svn clone >> > which >> > > > then >> > > > > > pushes to the public git repo. >> > > > > > >> > > > > > Is this kind of integration with svn possible in Apache svn >> > > > repositories? >> > > > > > >> > > > > > >> > > > > >> > > > >> > > > >> > > > >> > > > -- >> > > > vic >> > > > >> > > > Quaerendo invenietis. >> > > > >> > > >> > >> > >
