Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I've been experimenting a lot with this lately, and think I managed to come up with a setup that somewhat works. Yes, it's a strict rebase-only regime, yes it's complicated, but you do get to use Git for working locally (speed, history, stash, index, etc).</p> <p>You can use branches behind the scenes when you collaborate with other Git users in your team I think, but haven't personally experimented too much with this. As long as you linearize the log before dcommitting it should work.</p> <p>Here's the short version (repeats a lot what's been already said):</p> <ol> <li>Clone the Subversion repo into a "fetching" repo on a central server</li> <li>Init a "bare" repo on the same server</li> <li>Push from the fecthing repo to the bare repo</li> <li>Have developers clone the bare repo and then <ol start="5"> <li><code>git svn init svnurl</code> to configure the git-svn remote, and</li> <li><code>git update-ref refs/remotes/git-svn refs/remotes/origin/master</code> so git-svn has a pointer to a revision</li> </ol></li> <li>Automatically (commit hook) have the "fetching" repo svn rebase, and push to the bare repo </li> <li>Developers pull from the bare repo with <code>git pull --rebase</code></li> <li>Developers running <code>git svn dcommit</code> first have to repeat the <code>update-ref</code> above in case of newer revisions coming from SVN.</li> </ol> <p>There's an <a href="http://blog.tfnico.com/2010/08/example-git-svn-mirror-workflow.html" rel="nofollow noreferrer">illustration of the workflow on this page</a> (I need more reputation points before I can inline the image). Update: Here we go:</p> <p><img src="https://3.bp.blogspot.com/_ZBn5rO9Auoo/TOUmwK5dZuI/AAAAAAAABGI/PAZtLMr9j3w/s640/git-svn.png" width="400" height="600"></p>
    singulars
    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.
 

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