<div dir="ltr">Thank you very much Chris, I believe I have a better idea of where to start now :)<br><br>Best Regards,<br><br><br><div class="gmail_quote">On Mon, Aug 2, 2010 at 9:10 AM, Chris Cormack <span dir="ltr"><<a href="mailto:chrisc@catalyst.net.nz">chrisc@catalyst.net.nz</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"><div class="im">* Susan Mustafa (<a href="mailto:susan.mustafa@gmail.com">susan.mustafa@gmail.com</a>) wrote:<br>
</div><div class="im">> Chris,<br>
><br>
> I really am sorry to bother you with my many questions, but I would hope<br>
> that you can clarify something for me.<br>
><br>
> At the moment, my company is using only open-source software applications,<br>
> such as OpenSIS, Koha, OpenERP, etc.<br>
><br>
> The problem is, we got all those except Koha from Vendors [To match our<br>
> requirements/Modifications]<br>
><br>
> To further complicate things, the company wants to keep up with the<br>
> updates and upgrades that source forge produces.<br>
><br>
> How do I do all this?<br>
><br>
> From what I understood, you are saying connect to the central git,<br>
> checkout a [development branch-where I can continue to make further<br>
> modifications to without the need to commit], and once an upgrade comes,<br>
> then I will try to MERGE my [development branch] + [central GIT].<br>
><br>
</div>Ideally you wouldn't need to make local modifications, and if you did<br>
you would do them with a system preference and then you could send<br>
patches upstream for inclusion into Koha.<br>
<br>
But if you want to have local changes that are never submitted upstream,<br>
you would clone the git repository from <a href="http://git.koha-community.org" target="_blank">git.koha-community.org</a>. Make a<br>
branch for your local changes, make changes, commit them to that branch,<br>
merge or rebase from the relevant upstream branch (in your case<br>
rel_3_0).<br>
<br>
Git is a distributed version control system, so you can commit locally,<br>
it is only when you push or send patches, that your changes move from<br>
being local.<br>
<div class="im"><br>
> Now for Koha - you are saying this is easier if I do a [Development<br>
> Install, rather than the recommended Production install]<br>
><br>
</div>If you intend to do local development, then a development install is the<br>
way to go. If you intend to instead just upgrade with each new release,<br>
then a standard install is the way to go.<br>
<div class="im"><br>
> Am I understanding your point, or am I way off?<br>
><br>
> I really wish I can read some resources out there that explain how to do<br>
> client modifications to opensource projects and still be up-to-date with<br>
> whatever the central repository has. Any articles/websites would greatly<br>
> benefit me?<br>
><br>
</div>The best read for that is<br>
<a href="http://wiki.koha-community.org/wiki/Version_Control_Using_Git" target="_blank">http://wiki.koha-community.org/wiki/Version_Control_Using_Git</a><br>
and<br>
<a href="http://www.myacpl.org/koha/?p=558" target="_blank">http://www.myacpl.org/koha/?p=558</a><br>
<br>
Hope this is some help, jump onto irc sometime #koha on<br>
<a href="http://irc.katipo.co.nz" target="_blank">irc.katipo.co.nz</a>, I'm around on there a bit and I can show you some<br>
practical examples.<br>
<br>
Better yet, if you can manage to make it to the developer conference<br>
part of kohacon (<a href="http://www.kohacon10.org.nz" target="_blank">http://www.kohacon10.org.nz</a>) we will be covering a lot<br>
about how to use git effectively.<br>
<br>
Hope this helps<br>
<font color="#888888"><br>
Chris<br>
</font><div><div></div><div class="h5"><br>
> Best Regards,<br>
><br>
> On Mon, Aug 2, 2010 at 8:13 AM, Chris Cormack <<a href="mailto:chrisc@catalyst.net.nz">chrisc@catalyst.net.nz</a>><br>
> wrote:<br>
><br>
> * Susan Mustafa (<a href="mailto:susan.mustafa@gmail.com">susan.mustafa@gmail.com</a>) wrote:<br>
> > Good Day,<br>
> ><br>
> > Chris, I am using "SVN". I made my own svn repository, and not<br>
> using<br>
> > KOHA's git repository.<br>
><br>
> Wow ... are you tracking git changes, and importing those into your svn<br>
> repo? I fear you have made a real rod for your back if not.<br>
> ><br>
> > Honestly, not sure of how to proceed.<br>
> ><br>
> > I looked at doing merging yesterday and such, but then noticed that<br>
> the<br>
> > final [Installed} koha, has the directory structure of<br>
> > intranet/opac/etc....<br>
> ><br>
> > But the freshly unzipped tar of koha 3.0.6 has many many different<br>
> > packages. So I assume I can't do merge between the two, but rather<br>
> I have<br>
> > to [Install KOHA 3.0.6] on a new machine THEN try and merge that<br>
> installed<br>
> > koha with [our installed koha]. Both then will have the same<br>
> > intranet/opac directory structure and merging is possible.<br>
> ><br>
> > Does that make sense? IS there is an easier way?? hehe<br>
> ><br>
> I'm not sure there is an easier way ... if you had been using git you<br>
> could checkout the rel_3_0 branch in git, and merge your local branch<br>
> into it, and run the upgrader.<br>
><br>
> But as you have a pretty non standard Koha installation, I suspect yes,<br>
> you are going to have to do a lot of work manually merging files, I<br>
> strongly recommend if you are going to do local changes, that in future<br>
> you do a dev install, which runs out of your git checkout and track your<br>
> changes that way. It will make your life a million times easier when you<br>
> want to upgrade to 3.2.0<br>
> Chris<br>
> > Regards,<br>
> ><br>
> > On Mon, Aug 2, 2010 at 1:15 AM, Chris Cormack<br>
> <<a href="mailto:chrisc@catalyst.net.nz">chrisc@catalyst.net.nz</a>><br>
> > wrote:<br>
> ><br>
> > * Susan Mustafa (<a href="mailto:susan.mustafa@gmail.com">susan.mustafa@gmail.com</a>) wrote:<br>
> > > Good Day All,<br>
> ><br>
> > Hi Susan<br>
> > ><br>
> > > I would like to know how I can start the upgrade process<br>
> from Koha<br>
> > 3.00.00<br>
> > > to Koha 3.0.6 [Kindly keep in mind that our version of Koha<br>
> 3.0.0<br>
> > has a<br>
> > > lot of in-house changes]<br>
> > ><br>
> > How have your changes been made, have they been checked into a<br>
> local git<br>
> > repository?<br>
> > > What steps should I follow? Resources to read?<br>
> > ><br>
> > Normally you would do an upgrade as outlined in one of the<br>
> INSTALL<br>
> > files, but with local changes, its not as easy as that.<br>
> > > I know there is the subversion vendor branches merge that I<br>
> can do,<br>
> > but I<br>
> > > am unsure if that will work and be sufficient.<br>
> > ><br>
> > We (the koha project) don't use subversion, do you mean git?<br>
> ><br>
> > > Kindly awaiting your response,<br>
> > ><br>
> > Chris<br>
> ><br>
> > --<br>
> > Chris Cormack<br>
> > Catalyst IT Ltd.<br>
> > +64 4 803 2238<br>
> > PO Box 11-053, Manners St, Wellington 6142, New Zealand<br>
> > -----BEGIN PGP SIGNATURE-----<br>
> > Version: GnuPG v1.4.10 (GNU/Linux)<br>
> ><br>
> > iEYEARECAAYFAkxV49wACgkQZgbcHEvgMLN2/ACdEc/x3uY0QyR6LXMEl5nUr2xa<br>
> > qWsAoKzJrZ8Gt4YQSMmAbrO5KKBmxM/0<br>
> > =pj2q<br>
> > -----END PGP SIGNATURE-----<br>
><br>
> --<br>
> Chris Cormack<br>
> Catalyst IT Ltd.<br>
> +64 4 803 2238<br>
> PO Box 11-053, Manners St, Wellington 6142, New Zealand<br>
> -----BEGIN PGP SIGNATURE-----<br>
> Version: GnuPG v1.4.10 (GNU/Linux)<br>
><br>
> iEYEARECAAYFAkxWRdoACgkQZgbcHEvgMLMqqACgp7NdTx54KgK2hpd08EZieuyo<br>
> YL8AmwXPC/PkdaE65tclUrZRTuZP7dno<br>
> =kSxg<br>
> -----END PGP SIGNATURE-----<br>
<br>
</div></div>--<br>
<div><div></div><div class="h5">Chris Cormack<br>
Catalyst IT Ltd.<br>
+64 4 803 2238<br>
PO Box 11-053, Manners St, Wellington 6142, New Zealand<br>
</div></div><br>-----BEGIN PGP SIGNATURE-----<br>
Version: GnuPG v1.4.10 (GNU/Linux)<br>
<br>
iEYEARECAAYFAkxWU1QACgkQZgbcHEvgMLNNWwCfWrKdW17ZEkXZEOIfYbkq6cGF<br>
eB8An0C0WyeeIU1hf3frVPAKWTnTvw9B<br>
=bHaw<br>
-----END PGP SIGNATURE-----<br>
<br></blockquote></div><br></div>