StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POgit-svn fails to dcommit, even after clean checkout
text
Body
copied!<p>I'm trying to use git-svn with the following project:</p> <p><a href="https://svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-js/trunk/" rel="noreferrer">https://svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-js/trunk/</a></p> <p>Which I've checked out using the standard <code>git svn clone https://svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-js/trunk/ -T trunk -b branches -t tags</code> invocation.</p> <p>I started having trouble using git-svn dcommit with git-svn after branching with <code>git checkout -b</code> and not <code>git svn branch</code>, and then merging that local branch back into master, and trying to dcommit. Now, strangely, even after doing a clean checkout, I am still having errors when I attempt to dcommit.</p> <p>The following rather long trace is representative of my current workflow with git-svn:</p> <pre><code>jacob@jacob-laptop:~/workspace/gsoc2010/scxml-js$ git svn dcommit Committing to https://jbeard@svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-js/trunk ... M build-common.xml M src/xslt/backends/js/StateTableStatechartGenerator.xsl M src/xslt/backends/js/SwitchyardStatechartGenerator.xsl M src/xslt/ir-compiler/appendTransitionInformation.xsl M src/xslt/ir-compiler/copyEnumeratedEventTransitions.xsl M src/xslt/ir-compiler/flattenTransitions.xsl M src/xslt/ir-compiler/nameTransitions.xsl M src/xslt/ir-compiler/numberStatesAndTransitions.xsl M src/xslt/ir-compiler/splitTransitionTargets.xsl M src/xslt/util/language-frontend-module-generators/sh-from-topo-sort-list-generator.xsl M src/xslt/util/topo-sort.xsl Committed r1037491 W: 502073c202cb1fbe089f0e8b7100304f0aa74729 and refs/remotes/trunk differ, using rebase: :100644 100644 7930fd690be01a5716490704b5556e2b5cab5ba6 51047f2c8cf1daaa94ae44433a9aa2acc222ae43 M build-common.xml :040000 040000 59251941b33bda1376881b33bb2263ea87b1b947 2f5e2586e26bc7d05def065cfcf05327982b81d7 M src Current branch master is up to date. # of revisions changed before: 39c6f7e2d7b82cc782b8770d1ddb0ecb4f86e780 c5f360feb3a6bdaab2fb2f48d05e8691824e3231 after: 502073c202cb1fbe089f0e8b7100304f0aa74729 39c6f7e2d7b82cc782b8770d1ddb0ecb4f86e780 c5f360feb3a6bdaab2fb2f48d05e8691824e3231 If you are attempting to commit merges, try running: git rebase --interactive --preserve-merges refs/remotes/trunk Before dcommitting jacob@jacob-laptop:~/workspace/gsoc2010/scxml-js$ git svn rebase M build-common.xml M src/xslt/ir-compiler/nameTransitions.xsl M src/xslt/ir-compiler/copyEnumeratedEventTransitions.xsl M src/xslt/ir-compiler/appendTransitionInformation.xsl M src/xslt/ir-compiler/flattenTransitions.xsl M src/xslt/ir-compiler/numberStatesAndTransitions.xsl M src/xslt/ir-compiler/splitTransitionTargets.xsl M src/xslt/backends/js/SwitchyardStatechartGenerator.xsl M src/xslt/backends/js/StateTableStatechartGenerator.xsl M src/xslt/util/language-frontend-module-generators/sh-from-topo-sort-list-generator.xsl M src/xslt/util/topo-sort.xsl r1037491 = e8d820cfdca882a57fbfa003b9673313be6c9621 (refs/remotes/trunk) First, rewinding head to replay your work on top of it... Applying: Changed some paths around so python fronend works. Applying: Removed test_with_xsltproc.sh. This file no longer needed, as we now generate a bash backend module. jacob@jacob-laptop:~/workspace/gsoc2010/scxml-js$ git svn dcommit Committing to https://jbeard@svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-js/trunk ... M src/python/scxml/cgf/backends/js M src/python/scxml/cgf/xslt Committed r1037493 W: 8563b885bfca77ccb33a87f56f78e6323af022a9 and refs/remotes/trunk differ, using rebase: :040000 040000 c33b3d66ecc6735af3241d7f9cee383d2736f614 59251941b33bda1376881b33bb2263ea87b1b947 M src Current branch master is up to date. # of revisions changed before: 574e2e495fa12cf3d81004638a06e3315d0abba5 after: 8563b885bfca77ccb33a87f56f78e6323af022a9 574e2e495fa12cf3d81004638a06e3315d0abba5 If you are attempting to commit merges, try running: git rebase --interactive --preserve-merges refs/remotes/trunk Before dcommitting </code></pre> <p>I basically need to do a <code>git svn dcommit</code> followed by a <code>git svn rebase</code> for every commit since the last dcommit. This usually works cleanly, but sometimes fails and requires more manual work.</p> <p>What could be causing this problem with dcommit, such that even using a clean checkout does not resolve it?</p>

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