<div dir="ltr"><br>Good Day,<br><br>Chris, I am using "SVN". I made my own svn repository, and not using KOHA's git repository.<br><br>Honestly, not sure of how to proceed. <br><br>I looked at doing merging yesterday and such, but then noticed that the final [Installed} koha, has the directory structure of intranet/opac/etc....<br>
<br>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.<br>
<br>Does that make sense? IS there is an easier way?? hehe<br><br><br>Regards,<br><br><br><br><div class="gmail_quote">On Mon, Aug 2, 2010 at 1:15 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;">* Susan Mustafa (<a href="mailto:susan.mustafa@gmail.com">susan.mustafa@gmail.com</a>) wrote:<br>
> Good Day All,<br>
<br>
Hi Susan<br>
<div class="im">><br>
> I would like to know how I can start the upgrade process from Koha 3.00.00<br>
> to Koha 3.0.6 [Kindly keep in mind that our version of Koha 3.0.0 has a<br>
> lot of in-house changes]<br>
><br>
</div>How have your changes been made, have they been checked into a local git<br>
repository?<br>
<div class="im"><br>
> What steps should I follow? Resources to read?<br>
><br>
</div>Normally you would do an upgrade as outlined in one of the INSTALL<br>
files, but with local changes, its not as easy as that.<br>
<div class="im"><br>
> I know there is the subversion vendor branches merge that I can do, but I<br>
> am unsure if that will work and be sufficient.<br>
><br>
</div>We (the koha project) don't use subversion, do you mean git?<br>
<br>
> Kindly awaiting your response,<br>
><br>
Chris<br>
<font color="#888888"><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>
</font><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></blockquote></div><br></div>