StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO"Unable to determine upstream SVN information from working tree history"
text
Body
copied!<p>I'm trying to use the GCC git mirror, documented <a href="http://gcc.gnu.org/wiki/GitMirror" rel="noreferrer">here</a>.</p> <p>Some time ago, I cloned the git repository:</p> <pre><code>git clone git://gcc.gnu.org/git/gcc.git </code></pre> <p>Added the git-svn stuff:</p> <pre><code>git svn init -Ttrunk --prefix=origin/ svn+ssh://gcc.gnu.org/svn/gcc </code></pre> <p>And then <code>git svn rebase</code> and <code>git svn dcommit</code> etc. all worked nicely.</p> <p>Some months later, I've done various development work on local git branches, and I've come to commit more changes to upstream SVN:</p> <ol> <li><p>Update from the git miror:</p> <pre><code>$ git rebase </code></pre></li> <li><p>Ensure I have the absolute latest from SVN, but it doesn't work:</p> <pre><code>$ git svn rebase -v Unable to determine upstream SVN information from working tree history </code></pre></li> </ol> <p>Somehow I've broken the meta data! As well as the above, I think I did <code>git svn fetch</code> at some point, by mistake, but that shouldn't be harmful, should it?</p> <p>So, I tried creating a fresh branch from the remote git mirror:</p> <pre><code>$ git branch svntrunk remotes/origin/trunk $ git checkout svntrunk $ git svn rebase Unable to determine upstream SVN information from working tree history </code></pre> <p>A web search suggests that the branch history has somehow diverged from SVN, but I've checked <code>git log</code> and every commit has a corresponding <code>git-svn-id</code>, which seems to disprove that, no?</p> <p>So, I tried a fresh clone from git://gcc.gnu.org/git/gcc.git, and in that repository <code>git svn rebase</code> works fine. How can the two repos, in which both have had <code>git rebase</code> from the same source, have different history? Presumably they can't, and the difference is in the local meta-data?</p> <p>Now, I don't want to trash the repo that I've been working in (although I could), and exporting the patches to another repo to commit defeats the point of having git-svn in the first place. So, how can I repair 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