Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I did this using git svn, with my development done in a git repository. The remote development is done in subversion. I made a git svn clone of the subversion repository, which I push to a real git repository. A cronjob runs "git svn rebase &amp;&amp; git push" every now and again to create a git mirror of the subversion repo.</p> <p>In order to merge the subversion changes, I have 2 remotes in my local git copy - the "local development" origin and the "from subversion mirror" origin. Whenever I feel the need, I can merge changes from the subversion mirror into our development tree. Local changes are not affected, they live apart and don't mess up the svn mirror.</p> <p>I used <a href="http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way" rel="nofollow noreferrer">gitosis</a> to set up and administer the git repositories. The steps would be something like this (from memory, may be wrong):</p> <pre><code># set up the mirror git svn clone -s $SVN git remote add origin git@$MACHINE:svnmirror.git git push # + cron job to do git svn rebase &amp;&amp; git push every N hours/minutes # set up the local working copy for development git clone git://$MACHINE/svnmirror.git # that's an anonymous, read only clone # no push to the svn mirror for developers - only cronjob user can push there git remote add newproject git@$MACHINE:myproject.git git push newproject # now do the real deal git clone git://$MACHINE/myproject.git # hack hack hack git push # origin master not needed git remote add svnmirror git://$MACHINE/svnmirror.git git merge svnmirror/master git push </code></pre>
    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. 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