Changes between Version 4 and Version 5 of DeveloperGuidelines/Git


Ignore:
Timestamp:
12/20/11 21:54:56 (10 years ago)
Author:
Fran Boon
Comment:

Working process to migrate an existing branch to Git

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v4 v5  
    99== How? ==
    1010The 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
    11 === Migrating Branches ===
     11=== Migrating existing Branches ===
    1212Merge branch with trunk using normal Bzr tools
    1313
    14 Fork:
    15 * on !GitHub: https://github.com/flavour/eden/fork_select
    16 * manually (if you already have a fork): http://bitdrift.com/post/4534738938/fork-your-own-project-on-github
     14Assuming 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]:
     15* https://github.com/repositories/new
    1716{{{
    18 mv eden <mybranch>
    19 git clone git@github.com:<mygitusername>/eden.git
    20 cd eden
    21 diff -u ../<mybranch> > ../mybranch.diff
    22 patch -p0 < ../mybranch.diff
     17cd web2py/applications
     18mv <mybranch> <mybranch2>
     19git clone git@github.com:flavour/eden.git <mybranch>
     20}}}
     21* Delete the contents of <mybranch> other than {{{.git}}} & {{{.gitignore}}}
     22* Copy all the contents from <mybranch2> into <mybranch>
     23{{{
     24cd <mybranch>
    2325git commit -a
    2426git push origin master