Changes between Version 26 and Version 27 of DeveloperGuidelines/Git

Timestamp:

02/01/12 17:39:22 (13 years ago)

Author:

Fran Boon

Comment:

Move around to be easier for new devs in the common scenrio, now that we're past-Production

DeveloperGuidelines/Git

@@ -1 +1 @@
 = Git =
 [[TOC]]
-Sahana Eden has decided to move from !Bzr/LaunchPad to !Git/GitHub
-== Why? ==
-* The current repository is huge & bloated, taking too long to download.
-* Even simple changes take an age to Pull down to servers
-* Web2py no longer supports !Bzr/LaunchPad, so we want to be able to maintain a common tool to work with both repositories.
-* New developers are likely to be more familiar with !Git/GitHub
-== How? ==
-The preferred approach is to have a clean repository, in order to get the maximum benefit from the migration...although it is technically possible to [http://fearthecowboy.com/2011/04/29/converting-bazaar-repositories-to-git/ migrate the commit history]. Commit History will instead be maintained on the !LaunchPad site as an archive
 === Fork a fresh Branch ===
 * Sign-up for an account on [https://github.com GitHub]
@@ -21 +13 @@
 }}}
 
-=== Migrating existing Branches ===
-Merge branch with trunk using normal Bzr tools
-
-Assuming that you have already [https://github.com/flavour/eden/fork_select forked Eden Trunk], then you will need to create a new repository manually for additional branches, as you cannot [http://bitdrift.com/post/4534738938/fork-your-own-project-on-github fork your own project on GitHub]:
-* https://github.com/repositories/new
-{{{
-cd web2py/applications
-git clone git@github.com:flavour/eden.git <mybranch>2
-}}}
-* Move {{{.git}}} & {{{.gitignore}}} from <mybranch>2 to <mybranch>
-* Delete the rest of <mybranch>2
-* Edit {{{.git/config}}}:
-{{{
-[remote "origin"]
-    fetch = +refs/heads/*:refs/remotes/origin/*
-    url = git@github.com:<mygitusername>/<mybranch>.git
-}}}
-* Create the initial repo for this new branch
-{{{
-cd <mybranch>
-git add .
-git commit -am "Initial Git version of My branch"
-git push -u origin master
-git remote add upstream git://github.com/flavour/eden.git
-}}}
 === Developer Workflow ===
 We suggest adopting the [http://blog.hasmanythrough.com/2008/12/18/agile-git-and-the-story-branch-pattern Story Branch] pattern, which allows squashing commits in order to keep the main Trunk as clean as possible
@@ -163 +130 @@
 * Community Book: http://book.git-scm.com
 * Tips & Tricks: http://gitready.com
+
+== Why? ==
+Sahana Eden has decided to move from !Bzr/LaunchPad to !Git/GitHub
+* The current repository is huge & bloated, taking too long to download.
+* Even simple changes take an age to Pull down to servers
+* Web2py no longer supports !Bzr/LaunchPad, so we want to be able to maintain a common tool to work with both repositories.
+* New developers are likely to be more familiar with !Git/GitHub
+== How? ==
+The preferred approach is to have a clean repository, in order to get the maximum benefit from the migration...although it is technically possible to [http://fearthecowboy.com/2011/04/29/converting-bazaar-repositories-to-git/ migrate the commit history]. Commit History will instead be maintained on the !LaunchPad site as an archive
+
+=== Migrating existing Branches ===
+Merge branch with trunk using normal Bzr tools
+
+Assuming that you have already [https://github.com/flavour/eden/fork_select forked Eden Trunk], then you will need to create a new repository manually for additional branches, as you cannot [http://bitdrift.com/post/4534738938/fork-your-own-project-on-github fork your own project on GitHub]:
+* https://github.com/repositories/new
+{{{
+cd web2py/applications
+git clone git@github.com:flavour/eden.git <mybranch>2
+}}}
+* Move {{{.git}}} & {{{.gitignore}}} from <mybranch>2 to <mybranch>
+* Delete the rest of <mybranch>2
+* Edit {{{.git/config}}}:
+{{{
+[remote "origin"]
+    fetch = +refs/heads/*:refs/remotes/origin/*
+    url = git@github.com:<mygitusername>/<mybranch>.git
+}}}
+* Create the initial repo for this new branch
+{{{
+cd <mybranch>
+git add .
+git commit -am "Initial Git version of My branch"
+git push -u origin master
+git remote add upstream git://github.com/flavour/eden.git
+}}}