Changes between Version 4 and Version 5 of DeveloperGuidelines/Git

Timestamp:

12/20/11 21:54:56 (13 years ago)

Author:

Fran Boon

Comment:

Working process to migrate an existing branch to Git

DeveloperGuidelines/Git

@@ -9 +9 @@
 == 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 Branches ===
+=== Migrating existing Branches ===
 Merge branch with trunk using normal Bzr tools
 
-Fork:
-* on !GitHub: https://github.com/flavour/eden/fork_select
-* manually (if you already have a fork): http://bitdrift.com/post/4534738938/fork-your-own-project-on-github
+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
 {{{
-mv eden <mybranch>
-git clone git@github.com:<mygitusername>/eden.git
-cd eden
-diff -u ../<mybranch> > ../mybranch.diff
-patch -p0 < ../mybranch.diff
+cd web2py/applications
+mv <mybranch> <mybranch2>
+git clone git@github.com:flavour/eden.git <mybranch>
+}}}
+* Delete the contents of <mybranch> other than {{{.git}}} & {{{.gitignore}}}
+* Copy all the contents from <mybranch2> into <mybranch>
+{{{
+cd <mybranch>
 git commit -a
 git push origin master