OJS OCS OMP OHS

You are viewing the PKP Support Forum | PKP Home Wiki



State of branches in github

Are you responsible for making OJS work -- installing, upgrading, migrating or troubleshooting? Do you think you've found a bug? Post in this forum.

Moderators: jmacgreg, btbell, michael, bdgregg, barbarah, asmecher

Forum rules
What to do if you have a technical problem with OJS:

1. Search the forum. You can do this from the Advanced Search Page or from our Google Custom Search, which will search the entire PKP site. If you are encountering an error, we especially recommend searching the forum for said error.

2. Check the FAQ to see if your question or error has already been resolved.

3. Post a question, but please, only after trying the above two solutions. If it's a workflow or usability question you should probably post to the OJS Editorial Support and Discussion subforum; if you have a development question, try the OJS Development subforum.

State of branches in github

Postby johmue » Sun Nov 10, 2013 3:11 am

Hi,

Just to make sure that I got it right.

What is the state of the branches in github? My understandig:

master: the current developement state (3.x)
ojs-stable-2.4: the latest stable version of 2.4 (2.4.2 with recommended patches)

So in order to get the latest recommended patches including security patches I would pull the ojs-stable-2.4 branch and rebase my personal branch to that.

To do an update to 3.x when it is released I would switch to some ojs-stable-3.0 and rebase my personal branch to that.

Is that right?

Thanks

Johannes
johmue
 
Posts: 24
Joined: Sun Mar 11, 2012 2:32 am

Re: State of branches in github

Postby asmecher » Sun Nov 10, 2013 8:52 am

Hi Johannes,

That's correct -- just make sure you do the same with the lib/pkp submodule. (The commit hash isn't always up to date; it's always safe to use the head of whatever branch you're using for the application itself.)

Regards,
Alec Smecher
Public Knowledge Project Team
asmecher
 
Posts: 9099
Joined: Wed Aug 10, 2005 12:56 pm

Re: State of branches in github

Postby johmue » Sun Nov 10, 2013 9:55 am

Hi Alec,

thanks for your answer.

My personal branch I was referring to is actually a translation to Esperanto.

I forked ojs and pkp-lib on github and pushed my branch there.

git@github.com:johannes-mueller/ojs.git
git@github.com:johannes-mueller/pkp-lib.git

The branch is "eo-translation" (default branch).

The translation is still ongoing, the admin stuff is way behind the parts the users are seeing.

Anyway. Feel free to pull, merge, whatever


Johannes
johmue
 
Posts: 24
Joined: Sun Mar 11, 2012 2:32 am

Re: State of branches in github

Postby asmecher » Wed Nov 13, 2013 12:49 pm

Hi Johannes,

When your translation is relatively stable, could you send a pull request? Make sure it's submitted against the branch it was coded against; I'll port it forward as necessary.

Thanks,
Alec Smecher
Public Knowledge Project Team
asmecher
 
Posts: 9099
Joined: Wed Aug 10, 2005 12:56 pm


Return to OJS Technical Support

Who is online

Users browsing this forum: Bing [Bot], Google [Bot], Yahoo [Bot] and 4 guests