Documentation/Create SVN Project Mirror: Difference between revisions

From Commontk
Jump to navigationJump to search
mNo edit summary
mNo edit summary
Line 9: Line 9:
git gc
git gc
git remote add origin git@github.com:commontk/PythonQt.git
git remote add origin git@github.com:commontk/PythonQt.git
git push origin master:refs/heads/svn-mirror
git branch -M svn-mirror
git push origin svn-mirror:refs/heads/svn-mirror
</pre>
</pre>


Line 31: Line 32:
</pre>
</pre>


* Merge 'svn-mirror' branch with the 'patched' one
<pre>
Before:
 
          A---B---C patched
        /
    D---E svn-mirror
</pre>
 
<pre>
After:
 
          A---B---C patched
        /
    D---E---F---G svn-mirror
</pre>
 
* Rebase 'patched' branch on top of 'svn-mirror' branch
 
<pre>
git rebase patched svn-mirror
</pre>
 
<pre>
Before:
 
          A---B---C patched
        /
    D---E---F---G svn-mirror
</pre>
 
<pre>
After:
                  A'---B'---C' patched
                /
    D---E---F---G svn-mirror
</pre>

Revision as of 07:45, 29 July 2011

Home < Documentation < Create SVN Project Mirror
  • Setup the 'svn-mirror' branch
mkir PythonQt
cd PythonQt
git init
git svn init -T https://pythonqt.svn.sourceforge.net/svnroot/pythonqt/trunk/ --no-minimize-url
git svn fetch 
git gc
git remote add origin git@github.com:commontk/PythonQt.git
git branch -M svn-mirror
git push origin svn-mirror:refs/heads/svn-mirror
  • .. and the 'patched' branch
git checkout -b patched
  • hack, hack, hack
git push origin patched:refs/heads/patched
  • Rebase the 'svn-mirror' branch
git checkout svn-mirror
git svn rebase
Before:

          A---B---C patched
         /
    D---E svn-mirror
After:

          A---B---C patched
         /
    D---E---F---G svn-mirror
  • Rebase 'patched' branch on top of 'svn-mirror' branch
git rebase patched svn-mirror
Before:

          A---B---C patched
         /
    D---E---F---G svn-mirror
After:
                  A'---B'---C' patched
                 /
    D---E---F---G svn-mirror