Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>These conflicts have nothing to do with git-svn.</p> <p>If one has a couple of remotes: remote1 and remote2, and the history of these remotes has diverged, then rebase operation always rewrites the history of first remote on top of another.</p> <p>Suppose one has a single commit A referenced by master branch:</p> <pre><code>$ git log master * commit A Initial commit </code></pre> <p>And a couple of remotes with a diverged history:</p> <pre><code>$ git log remote1/master * commit R1 Added conflict.txt at remote1 * commit A Initial commit </code></pre> <p>and</p> <pre><code>$ git log remote2/master * commit R2 Added conflict.txt at remote2 * commit A Initial commit </code></pre> <p>Now one rebases the local history as follows:</p> <pre><code>$ git rebase remote1/master $ git log master * commit R1 Added conflict.txt at remote1 * commit A Initial commit </code></pre> <p>Now one tries to rebase the local history on top of remote2/master, gets conflicts and resolves them:</p> <pre><code>$ git rebase remote2/master $ git log master * commit R1 Added conflict.txt at remote1 * commit R2 Added conflict.txt at remote2 * commit A Initial commit </code></pre> <p>Noticed? Rebase operation puts commit R1 on top of R2. As you may expect, rebasing the given history on top of remote1/master just swaps commits R1 and R2 and generates exactly the same conflicts.</p> <p>How to fix that? Well, you have to make the history the same for both remotes. The safest way to do that is to merge commits R1 and R2 and push the resulting merge commit to both remote1 and remote2.</p> <p>Now back to git-svn. For your case, merging the diverged history won't work as git-svn always rewrites your local history when you run <code>git svn dcommit</code>. Instead you have to do the following:</p> <ol> <li><p>Fetch and rebase commits from Git repository:</p> <pre><code> $ git fetch origin $ git rebase origin/master (linearizes commits to svn) </code></pre></li> <li><p>Send the changes to SVN repository:</p> <pre><code> $ git svn rebase $ git svn dcommit </code></pre></li> <li><p>Push commits fetched from SVN back to origin:</p> <pre><code> $ git push -f origin master:master </code></pre></li> </ol> <p>The third step is extremely dangerous, it may result in a lost history. So, I don't recommend doing that — git-svn just does not support such workflow.</p> <p>Instead you may try <a href="http://subgit.com" rel="nofollow">SubGit</a>. SubGit is a bi-directional server-side mirror tool for SVN and Git repositories.</p> <p>If you have local access to Subversion repository, you can install SubGit into it:</p> <pre><code>$ subgit configure $SVN_REPOS # Adjust $SVN_REPOS/conf/subgit.conf to specify your branches and tags # Adjust $SVN_REPOS/conf/authors.txt to specify git &amp; svn authors mapping $ subgit install $SVN_REPOS ... $ INSTALLATION SUCCESSFUL </code></pre> <p>As result you get converted Git repository which is automatically synchronized with original SVN repository.</p> <p>If you have no local access to SVN repository, you may consider using SubGit 2.0 which is going to hit an early-access stage soon. SubGit 2.0 allows to setup bi-directional mirror between Git repository and remote SVN repository.</p> <p>SubGit is a commercial product. It is free for open-source and academic projects and also for projects with up to 10 committers.</p> <p>For more details please refer to <a href="http://subgit.com/documentation/" rel="nofollow">SubGit documentation</a> and <a href="http://subgit.com/documentation/gitsvn.html" rel="nofollow">git-svn</a> comparison page.</p> <p>Full disclosure: I'm one of SubGit developers.</p>
    singulars
    1. This table or related slice is empty.
    1. POEndless conflict between remote git repo and svn
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USvadishev
    1. USvadishev
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POEndless conflict between remote git repo and svn
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COThanks @radioversum. I stumbled across subgit and am *very* interested in this as an alternative. I've determined that attempting the git to svn bidirectional setup is going to be a risky move given that repositories can get completely borked. You guys have a good tool that helps to address this complexity. Now to convince my clients they need it.
      singulars
      1. PO
      1. USwittyhandle
    2. COthx a lot for the git push -f line ... I was stuck since a while !
      singulars
      1. PO
      1. USStéphane
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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