Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Say your SVN repo is at <strong>svn+ssh://username@svn_server/svn/your_repo</strong><br> and your SVN repository has a "proper" layout (trunk, branches, tags) Here's workflow I've been using for few months now:<br> 1. '<strong>mkdir your_repo</strong>'<br> 2. '<strong>cd your_repo</strong>'<br> 3. '<strong>git svn clone -s svn+ssh://username@svn_server/svn/your_repo .</strong>' (mind the dot)<br> 4. [wait a while depending on the size of your repository :)]<br> now your GIT 'master' tracks the SVN trunk<br> you can also make a tracking branch like you'd normally do with git if you're working on some branch<br> 5. the traditional <strong>hack hack hack</strong><br> 6. update your clone with '<strong>git svn fetch &amp;&amp; git svn rebase</strong>'<br> 7. "push" your changes to svn with '<strong>git svn dcommit</strong>'<br></p> <p><strong>More good stuff</strong><br> Define following handy aliases in your .gitconfig:<br> 1. Alias '<strong>spull</strong>' which stands for svn-pull like this: '<strong>spull = !git svn fetch &amp;&amp; git svn rebase</strong>'<br> 2. Alias '<strong>spush</strong>' which stands for svn-push like this: '<strong>spush = !git svn dcommit</strong>'<br> These aliases turn the workflow in to pure effectiveness: <strong>clone</strong>/<strong>hack hack</strong>/<strong>spull</strong>/<strong>spush</strong> -> <strong>profit</strong></p> <p><strong>svn:externals</strong><br> I couldn't find a good solution for this in the internet, so made one myself :)<br> <a href="http://github.com/sushdm/git_svn_externals/tree/master" rel="nofollow noreferrer">http://github.com/sushdm/git_svn_externals</a> it's not yet perfect, but it should definetely make life a lot easier.</p> <p>Works for me perfectly well, hope it helps you.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload