Changes between Version 19 and Version 20 of git-svn-tutorial

Show
Ignore:
Timestamp:
11/23/09 15:56:49 (5 years ago)
Author:
urkle
Comment:

Added "shortcut" hack to getting git-svn metadata from github clone. and cleaned up top part of document

Legend:

Unmodified
Added
Removed
Modified
  • git-svn-tutorial

    v19 v20  
     1= Getting the GIT checkout = 
     2== Import Straight from the SVN repo == 
    13First, we need to fetch a copy of the repository. 
    24 
     
    1921Which is very similar to {{{svn up}}}. 
    2022 
     23== From the leto's github mirror == 
     24 
    2125Because importing all of history is *very* time consuming, DukeLeto has already gone through the trouble and maintains a github mirror of Parrot at http://github.com/leto/parrot/tree/upstream .  
    2226{{{ 
     
    3236 
    3337}}} 
     38 
     39=== Adding git-svn metadata to the github clone === 
     40If you want to re-populate the SVN metadata that can quickly be done by taking your up-to-date clone of leto's repo off of gihub and adding this to your .git/config 
     41 
     42{{{ 
     43    [svn-remote "svn"] 
     44            url = https://svn.parrot.org/parrot 
     45            fetch = trunk:refs/remotes/trunk 
     46}}} 
     47 
     48Then run this command to find the "top commit" 
     49 
     50{{{ 
     51     git show origin/upstream | head -n 1 
     52}}} 
     53 
     54and put that commit hash into a file .git/refs/remotes/trunk (obviously replace the has with the one from the above command) 
     55 
     56{{{ 
     57     echo c85aaa38b99cedb087e5f6fb69ce6d4a6ac57a0b > .git/refs/remotes/trunk 
     58}}} 
     59 
     60and finally 
     61 
     62{{{ 
     63     git svn fetch 
     64}}} 
     65 
     66== From full git-svn tarball == 
    3467 
    3568You can also download a tar archive containing the complete history and all branches as well as svn meta data from  
     
    3871 * http://moritz.faui2k3.org/files/parrot-all-git-svn.tar.gz (recommended; prepared by Tene, polished by moritz). 
    3972 
     73= Basic local workflow = 
    4074Now, start working on patches.  The simplest way to work, without local branches, is: 
    4175