Menu
▾
▴
Re: [Tiki-devel] Migrate to git
|
From: Robert P. <rob...@gm...> - 2012-04-14 12:34:17
|
Very good points and I agree with every one. I think me talking about it is just so that it doesn't die, I do not have time for it right now with 9... so of course only after dust settles. When is the next tiki fest? On Apr 14, 2012 8:27 AM, "Torsten Fabricius" <to...@fa...> wrote: > Hi Robert, > > wouldn't it be better not to do this in trunk, but in a different > installation alongside trunk (I do not know exactly, but isn't there a > trunkdev also?) > I just mean this to avoid to affect the Daily Builds. > > A test on trunk might be a later step after successful first test on > trunkdev and if the other devs would agree and give it a plus one. > > I think Robert, if I understand well enough what you mean technically, > that some of the devs might shy away froma GIT/SVN combo more from > psychology than from technical doubts, as we all know that it is not always > a good idea to change a running system. > > Once you test and do some presentation - maybe not only at a TikiFest, but > also on a Webinar, you should have good chances to convince one after > another that this combo would be a win win situation without giving up any > existing workflow, but adding new opportunities for who ever would like to > use. > > Integrating new "GIT Devs" without expelling "SVN Devs" seems to be a good > idea, as your suggested solution keeps the main thing with SVN as it is. > I like the idea, especially I just have lerned to use SVN and I would not > need to adjust myself to something else again. > > But one thing I please you to consider: Wouldn't it be better to make > Tiki9 Stable first and then discuss the GIT/SVN combo in late spring / end > of April? > > --ToF > > Am 14.04.2012 13:58, schrieb Robert Plummer: > > That sounds like a good idea. It is simple enough. But yes the plan isnt > now to migrate to git but to simply update it along side SVN, and to auto > merge any commits into SVN from git. What I like about this plan is that > we literally have to change nothing. The scripts are very easy to setup, > and all the repositories are in place. A win win win. All we need is to > setup a crow job to do it for us. I'd like to run a few test merges and > see what happens. In trunk only. What do you guys think of that? > On Apr 14, 2012 7:36 AM, "Torsten Fabricius" <to...@fa...> wrote: > >> Hi Robert, >> >> maybe this would be something for a TikiFest, where you could do some >> presentation to a few developers and show the advantages of this step in >> practice and how disadvantages would be avoided. >> Maybe it is not clear enough, that you do not want to cease SVN, but to >> add GIT to SVN as additional extending option? >> >> What do you think? >> >> Cheers >> Torsten >> >> Am 14.04.2012 03:52, schrieb Robert Plummer: >> >> I never got any replies to this, is there any interest here? I know it >> is low on the priority list, but it is a great way for other developers to >> get involved. >> >> Come on guys give me a +1... svn + git will be a killer combo. >> >> On Wed, Apr 4, 2012 at 1:20 PM, Robert Plummer < >> rob...@gm...> wrote: >> >>> What about this guys: https://github.com/alloy/git-svn-mirror >>> We mirror svn to git, and commit changes from git to svn. We can also >>> start shifting some of our externals to use git (because that is where many >>> of them are). >>> >>> >>> On Thu, Mar 15, 2012 at 7:52 AM, Robert Plummer < >>> rob...@gm...> wrote: >>> >>>> All I need is syntax. ;) >>>> On Mar 15, 2012 12:21 AM, "Torsten Fabricius" <to...@fa...> >>>> wrote: >>>> >>>>> Hi Marc, >>>>> >>>>> emulating Rodrigo is a pretty good idea. >>>>> >>>>> Couldn't somebody write a Plugin or a JavaScript for that? >>>>> Hmmm maybe not enough ... Robert: could you try a parser? >>>>> >>>>> Just kidding :-D - c ya in the webinar. >>>>> >>>>> Cheers >>>>> Torsten >>>>> >>>>> Am 15.03.2012 03:55, schrieb Marc Laporte: >>>>> > Hi! >>>>> > >>>>> > Rodrigo wrote: "I have been using a local copy of Tiki repository >>>>> > created with git-svn for almost two years now." >>>>> > >>>>> > So all interested developers should emulate Rodrigo :-) >>>>> > >>>>> > Thanks! >>>>> > >>>>> > M ;-) >>>>> > >>>>> > On Wed, Mar 14, 2012 at 9:58 PM, Robert Plummer >>>>> > <rob...@gm...> wrote: >>>>> >> Marc, can you be more clear on what your proposal is? >>>>> >> >>>>> >> On Mar 14, 2012 9:27 PM, "Marc Laporte" <ma...@ma...> >>>>> wrote: >>>>> >>> Hi! >>>>> >>> >>>>> >>> This is the best of both worlds! >>>>> >>> >>>>> >>> Rodrigo, Robert and others can use Git, while we don't need to >>>>> change >>>>> >>> our testing & release scripts or update any accounts and to change >>>>> the >>>>> >>> workflow for the rest of the developers. >>>>> >>> >>>>> >>> I updated the page to reflect this: >>>>> >>> http://dev.tiki.org/Distributed+revision+control >>>>> >>> >>>>> >>> It would be really nice if Robert & Rodrigo can document this, and >>>>> >>> we'll likely see more & more people using Git. >>>>> >>> >>>>> >>> Thanks! >>>>> >>> >>>>> >>> >>>>> >>> -- >>>>> >>> Marc Laporte >>>>> >>> >>>>> >>> http://MarcLaporte.com >>>>> >>> http://Tiki.org/MarcLaporte >>>>> >>> http://AvanTech.net >>>>> >>> >>>>> >>> >>>>> >>> >>>>> >>> >>>>> >>> On Tue, Feb 21, 2012 at 9:18 AM, Rodrigo Primo < >>>>> rod...@gm...> >>>>> >>> wrote: >>>>> >>>> Hi Robert, >>>>> >>>> >>>>> >>>> Have you seen http://dev.tiki.org/Distributed+revision+control? >>>>> >>>> >>>>> >>>> I think Git is great but I'm not sure we have the energy required >>>>> to >>>>> >>>> proceed >>>>> >>>> with this migration. Mainly updating the release scripts and TRIM >>>>> and >>>>> >>>> providing a read-only SVN repository. >>>>> >>>> >>>>> >>>> I have been using a local copy of Tiki repository created with >>>>> >>>> git-svn for >>>>> >>>> almost two years now. It is not the same as having the whole >>>>> project >>>>> >>>> using >>>>> >>>> Git, but in my opinion, for development purposes, is much better >>>>> than >>>>> >>>> SVN. >>>>> >>>> You can use most of the nice Git features like git blame, git >>>>> stash, git >>>>> >>>> bisect just to mention a few. >>>>> >>>> >>>>> >>>> Rodrigo >>>>> >>>> >>>>> >>>> On Tue, Feb 21, 2012 at 9:03 AM, Jörn Ott <wh...@ot...> >>>>> wrote: >>>>> >>>>> Hello Robert, >>>>> >>>>> hello @all, >>>>> >>>>> >>>>> >>>>> at a customer, we did this migration during the last months. We >>>>> >>>>> implemented this model: >>>>> >>>>> http://nvie.com/posts/a-successful-git-branching-model/ >>>>> >>>>> >>>>> >>>>> Thanks to the help of a qualified expert and a lot of additional >>>>> >>>>> services like a fully automated Jenkins Build Server which does >>>>> run >>>>> >>>>> tests, build and debian packaging, we could convince most >>>>> developers. >>>>> >>>>> >>>>> >>>>> As I was only involved as a sysadmin with some simple projects >>>>> and we >>>>> >>>>> had an expert coaching us, I found the transition quite easy. >>>>> However, >>>>> >>>>> I >>>>> >>>>> noticed a lot of skilled programmers having difficulties and a >>>>> few >>>>> >>>>> misunderstandings leading to some confusion. >>>>> >>>>> >>>>> >>>>> So, from my point of view, I would recommend this (together with >>>>> a lot >>>>> >>>>> of "feature branches" which will be merged back to develop >>>>> (trunk) when >>>>> >>>>> the feature is ready. But in order to make this transition work >>>>> and get >>>>> >>>>> most of the submitters behind it, I'd recommend a decent >>>>> >>>>> training/presentation on some tikifest in America and Europe >>>>> first. >>>>> >>>>> >>>>> >>>>> Best regards >>>>> >>>>> Jörn >>>>> >>>>> >>>>> >>>>> Am 20.02.2012 22:18, schrieb Robert Plummer: >>>>> >>>>>> I know there has been a lot of questions about this in the >>>>> past. I'd >>>>> >>>>>> like to bring it up, I think that git embodies the whole tiki >>>>> coding >>>>> >>>>>> model quite well and it makes sharing much easier. Who would >>>>> like to >>>>> >>>>>> migrate to git after we get version 9 out the door? >>>>> >>>>>> >>>>> >>>>>> -- >>>>> >>>>>> Robert Plummer >>>>> >>>>>> >>>>> >>>>>> >>>>> >>>>>> >>>>> >>>>>> >>>>> >>>>>> >>>>> ------------------------------------------------------------------------------ >>>>> >>>>>> Try before you buy = See our experts in action! >>>>> >>>>>> The most comprehensive online learning library for Microsoft >>>>> >>>>>> developers >>>>> >>>>>> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, >>>>> CSS3, >>>>> >>>>>> MVC3, >>>>> >>>>>> Metro Style Apps, more. Free future releases when you subscribe >>>>> now! >>>>> >>>>>> http://p.sf.net/sfu/learndevnow-dev2 >>>>> >>>>>> >>>>> >>>>>> >>>>> >>>>>> >>>>> >>>>>> _______________________________________________ >>>>> >>>>>> TikiWiki-devel mailing list >>>>> >>>>>> Tik...@li... >>>>> >>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >>>>> >>>>> -- >>>>> >>>>> Mit freundlichen Grüßen >>>>> >>>>> Jörn Ott >>>>> >>>>> -- >>>>> >>>>> ------------------------------------------------------------ >>>>> >>>>> Jörn Ott Telefon: (0 22 24) 94 08 - 73 >>>>> >>>>> EDV Service & Beratung Telefax: (0 22 24) 94 08 -74 >>>>> >>>>> Hauptstr. 11e E-Mail: mailto:wh...@ot... >>>>> >>>>> 53604 Bad Honnef WWW: http://www.ott-service.de/ >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> >>>>> Keep Your Developer Skills Current with LearnDevNow! >>>>> >>>>> The most comprehensive online learning library for Microsoft >>>>> developers >>>>> >>>>> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, >>>>> CSS3, >>>>> >>>>> MVC3, >>>>> >>>>> Metro Style Apps, more. Free future releases when you subscribe >>>>> now! >>>>> >>>>> http://p.sf.net/sfu/learndevnow-d2d >>>>> >>>>> _______________________________________________ >>>>> >>>>> TikiWiki-devel mailing list >>>>> >>>>> Tik...@li... >>>>> >>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >>>>> >>>> >>>>> >>>> >>>>> >>>> >>>>> >>>> -- >>>>> >>>> http://rodrigo.utopia.org.br >>>>> >>>> >>>>> >>>> >>>>> >>>> >>>>> >>>> >>>>> ------------------------------------------------------------------------------ >>>>> >>>> Keep Your Developer Skills Current with LearnDevNow! >>>>> >>>> The most comprehensive online learning library for Microsoft >>>>> developers >>>>> >>>> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, >>>>> CSS3, MVC3, >>>>> >>>> Metro Style Apps, more. Free future releases when you subscribe >>>>> now! >>>>> >>>> http://p.sf.net/sfu/learndevnow-d2d >>>>> >>>> _______________________________________________ >>>>> >>>> TikiWiki-devel mailing list >>>>> >>>> Tik...@li... >>>>> >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >>>>> >>>> >>>>> >>> >>>>> >>> >>>>> >>> -- >>>>> >>> Marc Laporte >>>>> >>> >>>>> >>> http://MarcLaporte.com >>>>> >>> http://Tiki.org/MarcLaporte >>>>> >>> http://AvanTech.net >>>>> >>> >>>>> >>> >>>>> >>> >>>>> ------------------------------------------------------------------------------ >>>>> >>> This SF email is sponsosred by: >>>>> >>> Try Windows Azure free for 90 days Click Here >>>>> >>> http://p.sf.net/sfu/sfd2d-msazure >>>>> >>> >>>>> >>> _______________________________________________ >>>>> >>> TikiWiki-devel mailing list >>>>> >>> Tik...@li... >>>>> >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >>>>> >> >>>>> >> >>>>> ------------------------------------------------------------------------------ >>>>> >> This SF email is sponsosred by: >>>>> >> Try Windows Azure free for 90 days Click Here >>>>> >> http://p.sf.net/sfu/sfd2d-msazure >>>>> >> _______________________________________________ >>>>> >> TikiWiki-devel mailing list >>>>> >> Tik...@li... >>>>> >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >>>>> >> >>>>> > >>>>> > >>>>> >>>>> -- >>>>> Torsten Fabricius >>>>> fon: +49 178 8 272 383 >>>>> to...@fa... >>>>> to...@ti... >>>>> >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> This SF email is sponsosred by: >>>>> Try Windows Azure free for 90 days Click Here >>>>> http://p.sf.net/sfu/sfd2d-msazure >>>>> _______________________________________________ >>>>> TikiWiki-devel mailing list >>>>> Tik...@li... >>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >>>>> >>>> >>> >>> >>> -- >>> Robert Plummer >>> >> >> >> >> -- >> Robert Plummer >> >> >> ------------------------------------------------------------------------------ >> For Developers, A Lot Can Happen In A Second. >> Boundary is the first to Know...and Tell You. >> Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!http://p.sf.net/sfu/Boundary-d2dvs2 >> >> >> >> _______________________________________________ >> TikiWiki-devel mailing lis...@li...https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >> >> >> -- >> Torsten Fabricius >> fon: +49 178 8 272 383...@fa...to...@ti... >> >> >> >> ------------------------------------------------------------------------------ >> For Developers, A Lot Can Happen In A Second. >> Boundary is the first to Know...and Tell You. >> Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! >> http://p.sf.net/sfu/Boundary-d2dvs2 >> _______________________________________________ >> TikiWiki-devel mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >> >> > > ------------------------------------------------------------------------------ > For Developers, A Lot Can Happen In A Second. > Boundary is the first to Know...and Tell You. > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!http://p.sf.net/sfu/Boundary-d2dvs2 > > > > _______________________________________________ > TikiWiki-devel mailing lis...@li...https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > > > -- > Torsten Fabricius > fon: +49 178 8 272 383...@fa...to...@ti... > > > > ------------------------------------------------------------------------------ > For Developers, A Lot Can Happen In A Second. > Boundary is the first to Know...and Tell You. > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > http://p.sf.net/sfu/Boundary-d2dvs2 > _______________________________________________ > TikiWiki-devel mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > > |