[Koha-devel] Git Repository Questions

[Michael Hafen]

This is similar to what I do for myself.  The only difference is, for
me, KohaDevServer and MyKohaGit are the same server.  So I actually pull
to a private repo on Dev and then push to MyKohaGit once things are
stable ( in theory ).  Pulls are fine, and I push straight to the file
system.

Ok, maybe it isn't that similar.

At any rate, I expect you're setup will have two challenges.  First is
getting what you pull from git.koha.org to jive with what's in
MyKohaGit.  I like to rebase when I pull ( which may not be the best
way, but it's cleaner ).  This means I often have to resolve conflicts
where my patches don't apply after a pull.  Makes things interesting for
those who pull from my repo.  The other challenge will be getting
MyKohaGit setup so you can push to it from KohaDevServer.  I think it's
been done on git.koha.org so the release maintainers can push patches
up.  I don't know how, but they might be able to help.

To answer your question, yes, it is as simple as cloning git.koha.org.
The only question is do you log into MyKohaGit for the pulls, or do you
pull to KohaDevServer, and push from there to MyKohaGit.

I'd recommend pulling from git.koha.org to KohaDevServer.  Then you can
resolve any patch conflicts before you push to MyKohaGit.  Depending on
how you pull and resolve conflicts you might have to force the push.
The way I do it I have to, because my patches change as necessary to
follow changes from git.koha.org.  This will cause some difficulties
when pulling to KohaProductionServer.  After a force push I find it
easiest on KohaProductionServer to drop the local branch that follows my
development branch, and create a new one to follow development.

Hope my rambling helps some.  Good luck.

On Tue, 2009-01-06 at 16:38 -0500, Kyle Hall wrote:
> Hello All,
>   I'm trying to do something that I'm sure is doable with git. I would
> like to set a 'middle-man' git repository that I can push and pull
> from to manage our development and production servers for our
> switchover to koha 3 and future development.
> 
> (git.koha.org)  --> (MyKohaGit) <---> (KohaDevServer)
>                                       \-------------> (KohaProductionServer)
> 
> So MyKohaGit pulls changes from git.koha.org, I pull and push changes
> between MyKohaGit and KohaDevServer, and when I'm satisfied that the
> changes are production ready, I pull the changes from MyKohaGit to
> KohaProductionServer.
> 
> I know I could just go straight between KohaDevServer and
> KohaProductionServer, but I'd like to make MyKohaGit public so others
> can track my updates that haven't made it into the official git repo
> yet.
> 
> Is it really as simple as cloning git.koha.org and making it available
> via http/ssh? I've tried creating an empty repository and pushing to
> it from a clone of git.koha.org, and it populates it, but I don't seem
> to have a mechanism to update MyKohaGit directly from git.koha.org.
> 
> Does any of this make sense?
> 
> Thanks,
> Kyle
> 
> http://www.kylehall.info
> Information Technology
> Crawford County Federated Library System ( http://www.ccfls.org )
> _______________________________________________
> Koha-devel mailing list
> Koha-devel at lists.koha.org
> http://lists.koha.org/mailman/listinfo/koha-devel
-- 
Michael Hafen
Systems Analyst and Programmer
Washington County School District
Utah, USA

for Koha checkout
http://koha-dev.washk12.org
or
git://koha-dev.washk12.org/koha