VCS

VCS

Hittesh Ahuja -
回帖数：1

Currently our university uses SVN as the main Version Control System for all of our major software packages including Moodle . I believe we might benefit more in terms of Moodle if we move over to GIT but that's a different topic altogether. 

 

I was wondering how can i use GIT ( moodle.git ) along with our SVN to make future upgrades more smoother. 

This is how it works at the moment :

 

  • Download a copy of the latest version of Moodle from the moodle.org website
  • Add our custom changes ( hacks  are added by hand one by one and additional plugins are added by doing a bulk copy of the folders ) to that code base
  • Commit that code base as a new branch to SVN
  • Start the upgrade progress

I guess my main concern are the core hacks.. Would /Can it be any smoother if I move over to GIT  ? 

Just wanted to throw this question out there as someone could / have been facing the same issue ?

Sorry in advance for sounding a bit vague as this is not a problem per say, just an opportunity for me to make my tasks more manageable.

 

Thanks

 

 

平均分： -
回复Hittesh Ahuja

Re: VCS

David Mudrák -
Core developers的头像 Documentation writers的头像 Moodle HQ的头像 Particularly helpful Moodlers的头像 Peer reviewers的头像 Plugin developers的头像 Plugins guardians的头像 Testers的头像 Translators的头像

I don't know recent news in Subversion. Since I started with Git, I didn't look back. If I remember correctly, it used to be pretty painful process to actually merge branches back to the main stream as SVN did not track the branching points implicitly. It may be much better these days though.

Said that, branching in Git is very natural and easy to manage. In Moodle HQ, we maintain customized "distributions" of Moodle for each our site (moodle.org, demo sites, moodle.net etc) in Git. Every single change and/or customization lives on a separate branch. We have some core hacks but thanks to the code management model we use, we seem to have them under control so far.

See excellent Andrew Nicols' blog posts http://thamblings.blogspot.cz/2013/07/upgrading-moodle-from-git.html and http://thamblings.blogspot.cz/2013/07/deploying-moodle-continued.html for more details.

平均分： -