Changes between Version 5 and Version 6 of GitMigration


Ignore:
Timestamp:
Sep 20, 2012, 4:49:00 AM (12 years ago)
Author:
brevilo
Comment:

The previous text described my approach but it was decided to do it differently, hence someone else needs to provide this content.

Legend:

Unmodified
Added
Removed
Modified

  • GitMigration

    v5 v6  
    11= Git Migration =
    22
    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 get 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 Tracked branches:
    27  * boinc_core_release_5_10
    28  * boinc_core_release_5_2
    29  * boinc_core_release_5_4
    30  * boinc_core_release_5_6
    31  * boinc_core_release_5_8
    32  * boinc_core_release_5_8a
    33  * boinc_core_release_6_10
    34  * boinc_core_release_6_10_36_a
    35  * boinc_core_release_6_12
    36  * boinc_core_release_6_2
    37  * boinc_core_release_6_4
    38  * boinc_core_release_6_6
    39  * boinc_core_release_6_6a
    40  * boinc_core_release_6_8
    41  * boinc_core_release_6_8_26
    42  * boinc_core_release_6_8_27
    43  * boinc_core_release_6_8_28
    44  * boinc_core_release_7_0
    45  * boinc_core_release_7_0a
    46 
    47 === Build dependencies VS 2005 ===
    48 
    49 Command:
    50 {{{
    51 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
    52 }}}
    53 
    54 Tracked branches:
    55  * boinc_depends_win_vs2005_6_10
    56  * boinc_depends_win_vs2005_6_12
    57  * boinc_depends_win_vs2005_6_8
    58  * boinc_depends_win_vs2005_7_0
    59  * boinc_depends_win_vs2005_7_0a
    60 
    61 === Build dependencies VS 2008 ===
    62 
    63 Command:
    64 {{{
    65 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
    66 }}}
    67 
    68 Tracked branches:
    69  * boinc_depends_win_vs2008_6_12
    70  * boinc_depends_win_vs2008_7_0
    71  * boinc_depends_win_vs2008_7_0a
    72 
    73 === Build dependencies VS 2010 ===
    74 
    75 Command:
    76 {{{
    77 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
    78 }}}
    79 
    80 Tracked branches:
    81  * boinc_depends_win_vs2008_6_12
    82  * boinc_depends_win_vs2008_7_0
    83  * boinc_depends_win_vs2008_7_0a
    84 
    85 == Cleaning / rewriting history ==
    86 
    87 === Binary removal ===
    88 
    89 Binaries removed, path starting with:
    90  * curl
    91  * icu
    92  * openssl
    93  * zlib
    94  * win_build/boinc_installshield.zip
    95 
    96 Command:
    97 {{{
    98 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; git rm -f --cached --ignore-unmatch win_build/boinc_installshield.zip' --tag-name-filter cat -- --all
    99 }}}
    100 
    101 === Rewriting author details ===
    102 
    103 SVN_USER - REAL_NAME/EMAIL mapping to be provided later (upon David's consent).
    104 
    105 Command:
    106 {{{
    107 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'
    108 }}}
    109 
    110 === Removing SVN UUID from commit messages ===
    111 
    112 Command:
    113 {{{
    114 git filter-branch --msg-filter 'sed "s/677681c0-c3c0-48b4-bd46-92119ef6d97a//g"' --tag-name-filter cat -- --all
    115 }}}
     3This page describes the SVN -> git migration.