| 1 | = Git Migration = |
| 2 | |
| 3 | This page describes the SVN -> git migration. It should be considered as not yet complete so stay tuned for more... |
| 4 | |
| 5 | == Conversion == |
| 6 | |
| 7 | During conversion the different projects previously hosted in SVN git separated into dedicated repositories: |
| 8 | |
| 9 | * [http://boinc.berkeley.edu/git/?p=boinc.git;a=summary BOINC] [[http://boinc.berkeley.edu/git/?p=boinccleaned.git;a=summary cleaned], see below] |
| 10 | * [http://boinc.berkeley.edu/git/?p=build-depends-vs2005.git;a=summary BOINC build dependencies VS 2005] |
| 11 | * [http://boinc.berkeley.edu/git/?p=build-depends-vs2008.git;a=summary BOINC build dependencies VS 2008] |
| 12 | * [http://boinc.berkeley.edu/git/?p=build-depends-vs2010.git;a=summary BOINC build dependencies VS 2010] |
| 13 | * [http://boinc.berkeley.edu/git/?p=boinc-alpha.git;a=summary BOINC Alpha] |
| 14 | * [http://boinc.berkeley.edu/git/?p=boinc-combined-stats.git;a=summary BOINC Combined Stats] |
| 15 | * [http://boinc.berkeley.edu/git/?p=boinc-lite.git;a=summary BOINC Lite] |
| 16 | * [http://boinc.berkeley.edu/git/?p=boinc-scenarios.git;a=summary BOINC Scenarios] |
| 17 | * [http://boinc.berkeley.edu/git/?p=bolt-examples.git;a=summary BOLT Examples] |
| 18 | |
| 19 | === BOINC === |
| 20 | |
| 21 | Command: |
| 22 | {{{ |
| 23 | git --bare svn init --trunk=trunk/boinc --tags=tags --branches=branches --ignore-refs="(SCHEDULER|boinc_app_release|boinc_release|boinc_server|checkin_notes|seti_boinc|start|vendor|unlabeled|setiathome|boinc_server|unlimited_stderr_out|staging|Pegasus|boinc_depends)" http://boinc.berkeley.edu/svn |
| 24 | }}} |
| 25 | |
| 26 | === Build dependencies VS 2005 === |
| 27 | |
| 28 | Command: |
| 29 | {{{ |
| 30 | git --bare svn init --trunk=trunk/boinc_depends_win_vs2005 --branches=branches --ignore-refs="(vendor|unlabeled|setiathome|boinc_server|unlimited_stderr_out|staging|Pegasus|boinc_core_release|boinc_depends_win_vs2008|boinc_depends_win_vs2010|server_stable)" http://boinc.berkeley.edu/svn |
| 31 | }}} |
| 32 | |
| 33 | === Build dependencies VS 2008 === |
| 34 | |
| 35 | Command: |
| 36 | {{{ |
| 37 | git --bare svn init --trunk=trunk/boinc_depends_win_vs2008 --branches=branches --ignore-refs="(vendor|unlabeled|setiathome|boinc_server|unlimited_stderr_out|staging|Pegasus|boinc_core_release|boinc_depends_win_vs2005|boinc_depends_win_vs2010|server_stable)" http://boinc.berkeley.edu/svn |
| 38 | }}} |
| 39 | |
| 40 | === Build dependencies VS 2010 === |
| 41 | |
| 42 | Command: |
| 43 | {{{ |
| 44 | git --bare svn init --trunk=trunk/boinc_depends_win_vs2010 --branches=branches --ignore-refs="(vendor|unlabeled|setiathome|boinc_server|unlimited_stderr_out|staging|Pegasus|boinc_core_release|boinc_depends_win_vs2005|boinc_depends_win_vs2008|server_stable)" http://boinc.berkeley.edu/svn |
| 45 | }}} |
| 46 | |
| 47 | == Cleaning / rewriting history == |
| 48 | |
| 49 | === Binary removal === |
| 50 | |
| 51 | Binaries removed, path starting with: |
| 52 | * curl |
| 53 | * icu |
| 54 | * openssl |
| 55 | * zlib |
| 56 | |
| 57 | Command: |
| 58 | {{{ |
| 59 | git filter-branch --index-filter 'git rm -rf --cached --ignore-unmatch curl; git rm -rf --cached --ignore-unmatch icu; git rm -rf --cached --ignore-unmatch openssl; git rm -rf --cached --ignore-unmatch zlib' --tag-name-filter cat -- --all |
| 60 | }}} |
| 61 | |
| 62 | === Rewriting author details === |
| 63 | |
| 64 | SVN_USER - REAL_NAME/EMAIL mapping to be provided later (upon David's consent). |
| 65 | |
| 66 | Command: |
| 67 | {{{ |
| 68 | git filter-branch --env-filter 'if [ $GIT_AUTHOR_NAME="<SVN_USER>" ]; then GIT_AUTHOR_NAME="<REAL_NAME>"; GIT_AUTHOR_EMAIL="<EMAIL>"; fi; export GIT_AUTHOR_NAME; export GIT_AUTHOR_EMAIL' |
| 69 | }}} |
| 70 | |
| 71 | === Removing SVN UUID from commit messages === |
| 72 | |
| 73 | Command: |
| 74 | {{{ |
| 75 | git filter-branch --msg-filter 'sed "s/677681c0-c3c0-48b4-bd46-92119ef6d97a//g"' --tag-name-filter cat -- --all |
| 76 | }}} |