svn commit: r1580625 - /incubator/usergrid/site/content/docs/contribute-code.md

[sn...@apache.org]

Author: snoopdave
Date: Sun Mar 23 21:54:48 2014
New Revision: 1580625

URL: http://svn.apache.org/r1580625
Log:
Adding Shawn

Modified:
    incubator/usergrid/site/content/docs/contribute-code.md

Modified: incubator/usergrid/site/content/docs/contribute-code.md
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/content/docs/contribute-code.md?rev=1580625&r1=1580624&r2=1580625&view=diff
==============================================================================
--- incubator/usergrid/site/content/docs/contribute-code.md (original)
+++ incubator/usergrid/site/content/docs/contribute-code.md Sun Mar 23 21:54:48 2014
@@ -43,6 +43,40 @@ Once you're signed up:
 * __Done!__ your changes will now be committed to the official [Apache Git repo](https://git-wip-us.apache.org/repos/asf?p=incubator-usergrid.git;a=summary).
 
 
+What about old forks?
+===
+
+If you previously developed with Apigee Usergrid (i.e. before we moved to Apache), you know our code used to be structured into _separate_ repositories: usergrid-stack, usergrid-portal, etc. We are now using a _merged_ repository.
+
+### How to update your code setup & pull changes from your old forks
+
+You just need to clone this repository, and use [git subtree (usually requires git 1.8+)](http://engineeredweb.com/blog/how-to-install-git-subtree/) to merge your changes under the new structure. Here’s an example for a portal fork. Adjust the prefix, repository address and branch you want to pull from as necessary.
+
+    git clone git@github.com:usergrid/usergrid.git
+    cd usergrid
+    git subtree pull --prefix=portal git@github.com:my-github-account/my-usergrid-portal-fork.git master
+
+This will pull (i.e. merge) the changes you made from the master branch of github.com/my-github-account/my-usergrid-portal-fork into the portal/ subfolder. It should ask you to provide a commit message for the merge. There’s lot of flexibility on how to fetch and merge, [please see the git subtree manual](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) for details. Then please do consider sending us a pull request with these changes ;)
+
+
+### How to pull commits made on this repo into your old forks
+
+You should really update your old repositories to the new structure with the instructions above, but the following may work for you, although we make no guarantee they will work in the future.
+
+You can produce a branch compatible with the old repos by using [git subtree (usually requires git 1.8+)](http://engineeredweb.com/blog/how-to-install-git-subtree/). Then from this repository you can
+
+    git clone git@github.com:usergrid/usergrid.git
+    cd usergrid
+    git checkout master
+    git subtree split --prefix=portal -b portal
+    git checkout portal
+
+This will create a “portal” branch that is compatible with the old usergrid-portal repository, from the code under the portal/ directory. You can pull from that branch (or push changes to it, although we will not accept pull requests sent thusly).
+
+The `git subtree split` above should function for portal, ugc, and any of the SDKs, but will not work for the stack, due to some anonymous comments left in the tree that prevent a split, and cannot be corrected lest we break the history and force a rebase on all forks.
+
+**Please update your code setup as soon as possible and [ask the dev list](https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/) if you have any questions!**
+