* Susan Mustafa (susan.mustafa@gmail.com) wrote:
Good Day,
Chris, I am using "SVN". I made my own svn repository, and not using KOHA's git repository.
Wow ... are you tracking git changes, and importing those into your svn repo? I fear you have made a real rod for your back if not.
Honestly, not sure of how to proceed.
I looked at doing merging yesterday and such, but then noticed that the final [Installed} koha, has the directory structure of intranet/opac/etc....
But the freshly unzipped tar of koha 3.0.6 has many many different packages. So I assume I can't do merge between the two, but rather I have to [Install KOHA 3.0.6] on a new machine THEN try and merge that installed koha with [our installed koha]. Both then will have the same intranet/opac directory structure and merging is possible.
Does that make sense? IS there is an easier way?? hehe
I'm not sure there is an easier way ... if you had been using git you could checkout the rel_3_0 branch in git, and merge your local branch into it, and run the upgrader. But as you have a pretty non standard Koha installation, I suspect yes, you are going to have to do a lot of work manually merging files, I strongly recommend if you are going to do local changes, that in future you do a dev install, which runs out of your git checkout and track your changes that way. It will make your life a million times easier when you want to upgrade to 3.2.0 Chris
Regards,
On Mon, Aug 2, 2010 at 1:15 AM, Chris Cormack <chrisc@catalyst.net.nz> wrote:
* Susan Mustafa (susan.mustafa@gmail.com) wrote: > Good Day All,
Hi Susan > > I would like to know how I can start the upgrade process from Koha 3.00.00 > to Koha 3.0.6 [Kindly keep in mind that our version of Koha 3.0.0 has a > lot of in-house changes] > How have your changes been made, have they been checked into a local git repository? > What steps should I follow? Resources to read? > Normally you would do an upgrade as outlined in one of the INSTALL files, but with local changes, its not as easy as that. > I know there is the subversion vendor branches merge that I can do, but I > am unsure if that will work and be sufficient. > We (the koha project) don't use subversion, do you mean git?
> Kindly awaiting your response, > Chris
-- Chris Cormack Catalyst IT Ltd. +64 4 803 2238 PO Box 11-053, Manners St, Wellington 6142, New Zealand -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkxV49wACgkQZgbcHEvgMLN2/ACdEc/x3uY0QyR6LXMEl5nUr2xa qWsAoKzJrZ8Gt4YQSMmAbrO5KKBmxM/0 =pj2q -----END PGP SIGNATURE-----
-- Chris Cormack Catalyst IT Ltd. +64 4 803 2238 PO Box 11-053, Manners St, Wellington 6142, New Zealand