HOW-TO check out PKP applications from git - Revision history

Alec: Protected "HOW-TO check out PKP applications from git" ([edit=sysop] (indefinite) [move=sysop] (indefinite))

2013-01-22T22:14:06Z

Protected "HOW-TO check out PKP applications from git" ([edit=sysop] (indefinite) [move=sysop] (indefinite))

Alec at 22:13, 22 January 2013

2013-01-22T22:13:59Z

Alec: /* Set up pkp submodule in your local application repository clone */

2012-12-11T18:09:16Z

‎Set up pkp submodule in your local application repository clone

24.87.85.164: /* Add the official repository */

2012-10-24T17:48:06Z

‎Add the official repository

24.87.85.164: /* Add the official repository */

2012-10-24T16:44:55Z

‎Add the official repository

Jmacgreg: Reverted edits by 220.200.60.147 (talk) to last revision by 70.36.48.151

2012-09-28T17:29:53Z

Reverted edits by 220.200.60.147 (talk) to last revision by 70.36.48.151

220.200.60.147 at 03:11, 22 August 2012

2012-08-22T03:11:22Z

70.36.48.151: /* Set up pkp submodule in your local application repository clone */

2012-07-31T05:59:48Z

‎Set up pkp submodule in your local application repository clone

70.36.48.151: /* Clone your personal application repository locally */

2012-07-31T05:59:25Z

‎Clone your personal application repository locally

Jerico.dev: fixed error

2011-02-01T03:38:59Z

fixed error

@@ Line 33: / Line 33: @@
 You can fork a subset of these projects if you do not intend to work on all of them. You'll always need the pkp-lib repository together with any of the application-specific repositories.
-= Clone your personal application repository locally =
+= Check out the application(s) on your local machine =
-−
-Please replace "your-pkp-workspace" and "your-user" with the appropriate values.
 <pre>
-cd ~/your-pkp-workspace
+sh checkout.sh.txt your-user ojs ojs-checkout
-git clone git@github.com:your-user/omp.git omp
-cd omp
 </pre>
+In the above example, "your-user" is your github.com username. It will check the "ojs" application out into a directory called "ojs-checkout".
-= Set up pkp submodule in your local application repository clone =
-−
-edit .gitmodules with your favourite editor and find:
- [submodule "lib/pkp"]
-         url = git@github.com:pkp/pkp-lib
-−
-Change the url to
-         url = git@github.com:your-user/pkp-lib.git
-−
-Execute:
- git submodule init
- git submodule update
-−
-= Add the official repository =
-−
-The 'official' respositories can be compared to the role that PKP's old CVS repositories used to fill.  Adding the official branch allows you to synchronize your code with the rest of the team, and should be pulled from before creating a patch or making a commit.
-−
-Execute:
- cd lib/pkp/
- # The following only works if you already have write access to the official repository:
- git remote add official git@github.com:pkp/pkp-lib.git
-−
- # If you don't, use this instead:
- git remote add official https://github.com/pkp/pkp-lib.git
-−
- git checkout master
- git pull official master
- cd ../..
-−
- # Again, use this if you have write access to the official repository:
- git remote add official git@github.com:pkp/omp.git
-−
- # or this, if you don't:
- git remote add official https://github.com/pkp/omp.git
-−
- git checkout master
- git pull official master
-−
-Now edit .git/config and lib/pkp/.git/config again. Find:
- [branch "master"]
-         remote = origin
-         merge = refs/heads/master
-−
-And change it to:
- [branch "master"]
-         remote = official
-         merge = refs/heads/master
-−
-for both repositories.
-−
-Save the files and execute
- git pull
-−
-for both repositories.
-−
-This should give you the output 'Already up-to-date'.
-−
-= Create development branches =
-−
-You'll not usually develop directly on the master branch. We can use the master branch to track released code and tested changes. You should have development branches for actual code changes.
-−
-Create development branches in the main project and the sub-module. The canonical set-up uses a branch called "dev".
-−
- git checkout -b dev
- git push origin dev
- cd lib/pkp/
- git checkout -b dev
- git push origin dev
- cd ../..
-−
-Next you edit lib/pkp/.git/config and '.git/config' and insert the following configuration to the end of both files:
- [branch "dev"]
-         remote = official
-         merge = refs/heads/master
-         rebase = true
-−
-You can now (optionally) delete the master branch in your personal remote github development repository as you won't probably need it. To do so you'll first have to go to the github website and switch your default branch to the dev branch:
-* Goto: https://github.com/your-user/omp/edit (replace 'your-user' in the URL with your github user)
-* Change the default branch to dev
-* Goto: https://github.com/your-user/pkp-lib/edit
-* Change the default branch to dev
-−
-Now you can enter the following commands locally to remove the remote master branch
- git push origin :master
- cd lib/pkp
- git push origin :master
- cd ../..
-−
-'''Be very careful to never enter this command with official rather than origin. Otherwise you'll drop the master repository!'''
 = Where to go from here? =

@@ Line 45: / Line 45: @@
 = Set up pkp submodule in your local application repository clone =
-edit .git/config with your favourite editor and find (or add if it's not there):
+edit .gitmodules with your favourite editor and find:
   [submodule "lib/pkp"]
           url = git@github.com:pkp/pkp-lib

@@ Line 66: / Line 66: @@
   # If you don't, use this instead:
-  git remote add official http://github.com/pkp/pkp-lib.git
+  git remote add official https://github.com/pkp/pkp-lib.git
   git checkout master
@@ Line 76: / Line 76: @@
   # or this, if you don't:
-  git remote add official http://github.com/pkp/omp.git
+  git remote add official https://github.com/pkp/omp.git
   git checkout master

@@ Line 62: / Line 62: @@
 Execute:
   cd lib/pkp/
-  git remote add official git@github.com:pkp/pkp-lib.git  # this only works if you already have write access to the official rep.
+ # The following only works if you already have write access to the official repository:
   git checkout master
   git pull official master
   cd ../..
   git remote add official git@github.com:pkp/omp.git
   git checkout master
   git pull official master

← Older revision		Revision as of 17:29, 28 September 2012
Line 129:		Line 129:

	[http://github.com/guides/git-cheat-sheet "Git cheat sheet"]		[http://github.com/guides/git-cheat-sheet "Git cheat sheet"]
−	~~[http://www.burberrybags-sale.com burberry bags]~~

← Older revision		Revision as of 03:11, 22 August 2012
Line 129:		Line 129:

	[http://github.com/guides/git-cheat-sheet "Git cheat sheet"]		[http://github.com/guides/git-cheat-sheet "Git cheat sheet"]
		+	[http://www.burberrybags-sale.com burberry bags]