No subject
Wed Nov 11 03:01:06 NZDT 2009
a [development branch-where I can continue to make further modifications to
without the need to commit], and once an upgrade comes, then I will try to
MERGE my [development branch] + [central GIT].
Now for Koha - you are saying this is easier if I do a [Development Install,
rather than the recommended Production install]
Am I understanding your point, or am I way off?
I really wish I can read some resources out there that explain how to do
client modifications to opensource projects and still be up-to-date with
whatever the central repository has. Any articles/websites would greatly
benefit me?
Best Regards,
On Mon, Aug 2, 2010 at 8:13 AM, Chris Cormack <chrisc at catalyst.net.nz>wrote:
> * Susan Mustafa (susan.mustafa at 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 at catalyst.net.nz
> >
> > wrote:
> >
> > * Susan Mustafa (susan.mustafa at 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
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
>
> iEYEARECAAYFAkxWRdoACgkQZgbcHEvgMLMqqACgp7NdTx54KgK2hpd08EZieuyo
> YL8AmwXPC/PkdaE65tclUrZRTuZP7dno
> =kSxg
> -----END PGP SIGNATURE-----
>
>
--001636d34cc6d9f2de048cd01643
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr">Chris,<br><br>I really am sorry to bother you with my many=
questions, but I would hope that you can clarify something for me.<br><br>=
At the moment, my company is using only open-source software applications, =
such as OpenSIS, Koha, OpenERP, etc.<br>
<br>The problem is, we got all those except Koha from Vendors [To match our=
requirements/Modifications]<br><br>To further complicate things, the compa=
ny wants to keep up with the updates and upgrades that source forge produce=
s.<br>
<br>How do I do all this?<br><br>From what I understood, you are saying con=
nect to the central git, checkout a [development branch-where I can continu=
e to make further modifications to without the need to commit], and once an=
upgrade comes, then I will try to MERGE my [development branch] + [central=
GIT].<br>
<br>Now for Koha - you are saying this is easier if I do a [Development Ins=
tall, rather than the recommended Production install]<br><br>Am I understan=
ding your point, or am I way off?<br><br>I really wish I can read some reso=
urces out there that explain how to do client modifications to opensource p=
rojects and still be up-to-date with whatever the central repository has.=
=A0 Any articles/websites would greatly benefit me?<br>
<br>Best Regards,<br><br><br><div class=3D"gmail_quote">On Mon, Aug 2, 2010=
at 8:13 AM, Chris Cormack <span dir=3D"ltr"><<a href=3D"mailto:chrisc at c=
atalyst.net.nz">chrisc at catalyst.net.nz</a>></span> wrote:<br><blockquote=
class=3D"gmail_quote" style=3D"margin: 0pt 0pt 0pt 0.8ex; border-left: 1px=
solid rgb(204, 204, 204); padding-left: 1ex;">
<div class=3D"im">* Susan Mustafa (<a href=3D"mailto:susan.mustafa at gmail.co=
m">susan.mustafa at gmail.com</a>) wrote:<br>
</div><div class=3D"im">> =A0 =A0Good Day,<br>
><br>
> =A0 =A0Chris, I am using "SVN". =A0I made my own svn reposit=
ory, and not using<br>
> =A0 =A0KOHA's git repository.<br>
<br>
</div>Wow ... are you tracking git changes, and importing those into your s=
vn<br>
repo? I fear you have made a real rod for your back if not.<br>
<div class=3D"im">><br>
> =A0 =A0Honestly, not sure of how to proceed.<br>
><br>
> =A0 =A0I looked at doing merging yesterday and such, but then noticed =
that the<br>
> =A0 =A0final [Installed} koha, has the directory structure of<br>
> =A0 =A0intranet/opac/etc....<br>
><br>
> =A0 =A0But the freshly unzipped tar of koha 3.0.6 has many many differ=
ent<br>
> =A0 =A0packages. =A0So I assume I can't do merge between the two, =
but rather I have<br>
> =A0 =A0to [Install KOHA 3.0.6] on a new machine THEN try and merge tha=
t installed<br>
> =A0 =A0koha with [our installed koha]. =A0Both then will have the same=
<br>
> =A0 =A0intranet/opac directory structure and merging is possible.<br>
><br>
> =A0 =A0Does that make sense? IS there is an easier way?? hehe<br>
><br>
</div>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>
<font color=3D"#888888"><br>
Chris<br>
</font><div><div></div><div class=3D"h5"><br>
> =A0 =A0Regards,<br>
><br>
> =A0 =A0On Mon, Aug 2, 2010 at 1:15 AM, Chris Cormack <<a href=3D"ma=
ilto:chrisc at catalyst.net.nz">chrisc at catalyst.net.nz</a>><br>
> =A0 =A0wrote:<br>
><br>
> =A0 =A0 =A0* Susan Mustafa (<a href=3D"mailto:susan.mustafa at gmail.com"=
>susan.mustafa at gmail.com</a>) wrote:<br>
> =A0 =A0 =A0> =A0 =A0Good Day All,<br>
><br>
> =A0 =A0 =A0Hi Susan<br>
> =A0 =A0 =A0><br>
> =A0 =A0 =A0> =A0 =A0I would like to know how I can start the upgrad=
e process from Koha<br>
> =A0 =A0 =A03.00.00<br>
> =A0 =A0 =A0> =A0 =A0to Koha 3.0.6 [Kindly keep in mind that our ver=
sion of Koha 3.0.0<br>
> =A0 =A0 =A0has a<br>
> =A0 =A0 =A0> =A0 =A0lot of in-house changes]<br>
> =A0 =A0 =A0><br>
> =A0 =A0 =A0How have your changes been made, have they been checked int=
o a local git<br>
> =A0 =A0 =A0repository?<br>
> =A0 =A0 =A0> =A0 =A0What steps should I follow? Resources to read?<=
br>
> =A0 =A0 =A0><br>
> =A0 =A0 =A0Normally you would do an upgrade as outlined in one of the =
INSTALL<br>
> =A0 =A0 =A0files, but with local changes, its not as easy as that.<br>
> =A0 =A0 =A0> =A0 =A0I know there is the subversion vendor branches =
merge that I can do,<br>
> =A0 =A0 =A0but I<br>
> =A0 =A0 =A0> =A0 =A0am unsure if that will work and be sufficient.<=
br>
> =A0 =A0 =A0><br>
> =A0 =A0 =A0We (the koha project) don't use subversion, do you mean=
git?<br>
><br>
> =A0 =A0 =A0> =A0 =A0Kindly awaiting your response,<br>
> =A0 =A0 =A0><br>
> =A0 =A0 =A0Chris<br>
><br>
> =A0 =A0 =A0--<br>
> =A0 =A0 =A0Chris Cormack<br>
> =A0 =A0 =A0Catalyst IT Ltd.<br>
> =A0 =A0 =A0+64 4 803 2238<br>
> =A0 =A0 =A0PO Box 11-053, Manners St, Wellington 6142, New Zealand<br>
> =A0 =A0 =A0-----BEGIN PGP SIGNATURE-----<br>
> =A0 =A0 =A0Version: GnuPG v1.4.10 (GNU/Linux)<br>
><br>
> =A0 =A0 =A0iEYEARECAAYFAkxV49wACgkQZgbcHEvgMLN2/ACdEc/x3uY0QyR6LXMEl5n=
Ur2xa<br>
> =A0 =A0 =A0qWsAoKzJrZ8Gt4YQSMmAbrO5KKBmxM/0<br>
> =A0 =A0 =A0=3Dpj2q<br>
> =A0 =A0 =A0-----END PGP SIGNATURE-----<br>
<br>
</div></div>--<br>
<div><div></div><div class=3D"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>
iEYEARECAAYFAkxWRdoACgkQZgbcHEvgMLMqqACgp7NdTx54KgK2hpd08EZieuyo<br>
YL8AmwXPC/PkdaE65tclUrZRTuZP7dno<br>
=3DkSxg<br>
-----END PGP SIGNATURE-----<br>
<br></blockquote></div><br></div>
--001636d34cc6d9f2de048cd01643--
More information about the Koha
mailing list