StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>git-svn will gives you a branches for each branches and tag in SVN (unless you use a <a href="https://stackoverflow.com/questions/572893/cloning-a-non-standard-svn-repository-with-git-svn/572898#572898">ruby script like svn2git</a>)</p> <p>The idea is to always <code>git-svn rebase</code> / <code>git-svn dcommit</code> a SVN branch.<br> ie, you will synchronize a Git branch with a SVN one (<code>git-svn rebase</code>), and you will update an SVN branch from the new commits in the corresponding Git branch (<code>git-svn dcommit</code>).</p> <p>Any local Git branches, with all their fancy merges, must be <em>local</em> (i.e. all those branches/merges in Git won't have any equivalent in the SVN repo)</p> <p>As the caveat in the <code>git-svn</code> goes (see the SO question "<a href="https://stackoverflow.com/questions/2693771/git-svn-merge-2-svn-branches">git-svn merge 2 svn branches</a>"):</p> <blockquote> <p>For the sake of simplicity and interoperating with a less-capable system (SVN), it is recommended that all <code>git svn</code> users <code>clone</code>, <code>fetch</code> and <code>dcommit</code> directly from the SVN server, and avoid all git <code>clone</code>/<code>pull</code>/<code>merge</code>/<code>push</code> operations between git repositories and branches.<br> The recommended method of exchanging code between git branches and users is <code>git format-patch</code> and <code>git am</code>, or just '<code>dcommit</code>'ing to the SVN repository.</p> <p>Running <code>git merge</code> or <code>git pull</code> is NOT recommended on a branch you plan to <code>dcommit</code> from.<br> Subversion does not represent merges in any reasonable or useful fashion; so users using Subversion cannot see any merges you've made. Furthermore, if you merge or pull from a git branch that is a mirror of an SVN branch, <code>dcommit</code> may commit to the wrong branch.</p> </blockquote>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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