From: M R. <mr...@gm...> - 2010-08-25 00:52:16
|
On Tue, 2010-08-24 at 23:40 +0200, Arnout Engelen wrote: > On Mon, Aug 23, 2010 at 08:28:46PM +0200, M Rawash wrote: > > On Mon, 2010-08-23 at 19:45 +0200, Arnout Engelen wrote: > > > I'd propose we now move forward and commit Notion to Git. I'd be happy to > > > push it - but I'd like to have the go-ahead from you guys first ;) > > > > but i was hoping we could review/discuss the first commit beforehand, do you > > have it uploaded somewhere? > > Sure! > > Afaics we currently have a few sources for the ion3 code: > - ion3-plus-darcs.tar.bz2 found in the #ion topic > - ion3plus-source.tar posted by 'milimouse' > - notion-20100409.tar.gz all, ion3-related code is available here (alas, no darcs log): http://github.com/gwash/repositories > It appears notion-20100409 has some recent updates not found in either of the > 2 darcs snapshots. AFAIK, the notion tarball had no additional updates beyond the name replacement, is there a way to be sure? > On the other hand, the darcs snapshots might allow us to > keep some of the version control history intact while moving to git - which > would be a huge win. indeed, IIRC, there's a script somewhere that could allow us to do that, however, i heard it's not 100% bulletproof, so some work might have to be done. > What I would *like* to do is: > - import a darcs snapshot (with all history) into a git repo > - as 1 commit, update it to also include the updates found in > notion-20100409.tar.gz (but not the name change) > - as 1 commit, apply the name change actually, i'm not for the name change part (yet!), not in the way it was done in the notion tarball anyway, as it could slowdown the adoption of notion by existing ion3 users (most of whom have specially tuned settings and scripts, that will most definitely need to be adapted for notion), instead, i'm for a gradual and *announced* change of function names and strings starting after our first 'official' tarball release. for now, we only need to worry about Tuomo's additional clauses that prohibit install conflicts with ion(3plus), as well as any reference to Tuomo and/or Tuomo's website for support. this can easily be done by a few alterations to the Makefiles (also, i suggest we get rid of pwm3 on this step too) and manpages/READMEs/etc... just my tuppence... > Unfortunately, both darcs snapshots above somehow seem broken or otherwise > unsuitable for conversion to a git repo keeping history intact. > Unless someone comes up with a non-'broken' snapshot or finds a way to get the > history from the darcs snapshots above, I think I'll just import > notion-20100409.tar.gz (with the changes to LICENSE reverted). i think i still have a few copies with full darcs history intact, not sure if they are as up-to-date as the ones on github though. regards, M Rawash |