Dear MJ,<br><br>Thanks you very much for the advice. As you guessed correctly, we haven't used git revision control. Now that I understand what's at stake in using it (having gone to check out the details on the koha wiki), is there any way to 're-insert' what we've got so far, other than to simply clone the latest version and do the same sort of 'three-way merge with ancestor' that you'd mentioned?<br>
<br>Again, thanks for your help.<br><br>Best,<br><br>Patrick Redmon<br>Librarian <br>Casa Balthasar<br><br><div class="gmail_quote">2009/9/22 MJ Ray <span dir="ltr"><<a href="mailto:mjr@phonecoop.coop">mjr@phonecoop.coop</a>></span><br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Bibliotecario Casa Balthasar asked<br>
<div class="im">> My first question is, I hope, relatively simple: Can we upgrade directly to<br>
> 3.00.03 from 3.00.01, or would it be better/more prudent to pass for 3.00.02<br>
> first?<br>
<br>
</div>I think you should be fine going to 3.00.03, but back up everything<br>
and if it fails, installing 3.00.02 might help to identify the<br>
problem by narrowing the search.<br>
<div class="im"><br>
> The second question is, given that we've modified some files (for example,<br>
> in<br>
> /usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/modules/cataloguing/value_builder,<br>
> we've modified the plugins for the leader and 008 so that it's possible to<br>
> use, e.g. |-No attempt to code per Festchrift), what's the best way to<br>
> handle the upgrade? Is it possible to make changes to files from the<br>
> upgrade tarball before the make upgrade or is it necessary to go ahead with<br>
> the upgrade and then follow-up afterwards readding the changes we've made?<br>
<br>
</div>If you've not used git revision control, I think the best way is to<br>
unpack the original 3.00.01 source, take a copy of your modified<br>
3.00.01 source, do the upgrade and then use a "three-way merge with<br>
ancestor" tool on the directories containing the modifications. Emacs<br>
has one called Ediff<br>
<a href="http://www.gnu.org/software/emacs/manual/html_node/ediff/index.html#Top" target="_blank">http://www.gnu.org/software/emacs/manual/html_node/ediff/index.html#Top</a><br>
but I expect other pretty ones are available. Again, backup everything.<br>
<br>
Hope that helps,<br>
<font color="#888888">--<br>
MJ Ray (slef) LMS developer and webmaster at | software<br>
<a href="http://www.software.coop" target="_blank">www.software.coop</a> <a href="http://mjr.towers.org.uk" target="_blank">http://mjr.towers.org.uk</a> | .... co<br>
IMO only: see <a href="http://mjr.towers.org.uk/email.html" target="_blank">http://mjr.towers.org.uk/email.html</a> | .... op<br>
</font></blockquote></div><br>