Nicole Engard and Colin Campbell, Thanks for the 'heads up' on git. 1. I'm not using git out of pure ignorance. Are you referring to http://git.koha.org or using git vice svn for version control? 2. Colin, in your message you talk about contributing my own changes back to the project. I'm new at koha (started supporting our librarian about 4 weeks ago) so this is all new to me. I really like the community model of making the koha software more robust, but what happens when my changes don't apply across all koha users? Branding for example. I certainly don't want to force irrelevant changes onto the entire community. 3. We use Subversion for all our other version control processes, so it was momentum that led me to use it for maintaining my local modifications. We have Koha on a live server and a development server with the idea of having Subversion "in between." 4. I will spend some time looking at http://git.koha.org and git itself. 5. Thanks again for the heads up. This Koha dev community is a tremendous resource :--) Thanks, Rick ------------------------------------------- Rick Forristall Programmer Analyst Goodwill of Central AZ 602.535.4078 ------------------------------------------- -----Original Message----- From: Nicole Engard [mailto:nengard@gmail.com] Sent: Tuesday, January 26, 2010 5:15 PM To: Richard Forristall Cc: koha-devel Subject: Re: [Koha-devel] Koha and Subversion Why are you using subversion and not git? I think everyone here uses git. Nicole 2010/1/26 Richard Forristall <Richard.Forristall@goodwillaz.org>:

Has anyone setup subversion to manage their Koha modifications?

I'm trying to create a subversion repository and get this error:

Adding         var/run/zebradb svn: Unknown or unversionable type for 'var/run/zebradb/authoritysocket'

Thanks,

Rick ------------------------------------------- Rick Forristall Programmer Analyst Goodwill of Central AZ 602.535.4078 -------------------------------------------

_______________________________________________ Koha-devel mailing list Koha-devel@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-devel

On 27/01/10 14:07, Richard Forristall wrote:

Thanks for the 'heads up' on git.

1. I'm not using git out of pure ignorance. Are you referring to http://git.koha.org or using git vice svn for version control?

git.koha.org is the repository but we were talking about git in general,

http://wiki.koha.org/doku.php?id=en:development:git_usage is informative about the process in general

2. Colin, in your message you talk about contributing my own changes back to the project. I'm new at koha (started supporting our librarian about 4 weeks ago) so this is all new to me. I really like the community model of making the koha software more robust, but what happens when my changes don't apply across all koha users? Branding for example. I certainly don't want to force irrelevant changes onto the entire community.

git makes it very easy to maintain local branches, for things specific to your site or for development, It also makes it easy to merge updates into them. So you could have in your local repository a branch holding the local changes, as well as branches tracking the git.koha.org version

3. We use Subversion for all our other version control processes You can use git-svn to create a git repository tracking a subversion repository giving you the ability to use gits local branches for development but pull from and commit to the subversion repository. It's also a good way to familiarize yourself with git if migrating in a subversion environment.

Colin -- Colin Campbell Chief Software Engineer, PTFS Europe Limited Content Management and Library Solutions +44 (0) 208 366 1295 (phone) +44 (0) 7759 633626 (mobile) colin.campbell@ptfs-europe.com skype: colin_campbell2 http://www.ptfs-europe.com