[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Fwd: git+svn - repo upgrade from 1.6.6.4 to 1.7.1 fails
From:       Fred <fred () akafred ! com>
Date:       2010-05-31 11:09:54
Message-ID: AANLkTikYYjl6Gv8SRMvtmzW1pyzkyu_mwLyEGHdWuH00 () mail ! gmail ! com
[Download RAW message or body]

Hi, I have a project with two remotes - one git and one svn. One
branch is only used for "git svn rebase", and then I cherrypick or
merge from it into my master branch. Most work is done in the master
branch (or other topic branches only available in git)

The repo was created under git 1.6.6.4. After updating git a while
back (to 1.7.1) it was time to merge inn a few things from svn - so i
switched to my "subversion" branch and did a

$ git svn rebase

Migrating from a git-svn v1 layout...
Data from a previous version of git-svn exists, but
.git/svn
(required for this version (1.7.1) of git-svn) does not exist.
Done migrating from a git-svn v1 layout
Unable to determine upstream SVN information from working tree history
---
I read this as: "I see your repo has some svn stuff and that it is
backlevel. I'll fix it for you. Oh shit, now I can't determine what
svn revision you are on."

Any ideas on how to resolve this? We're a dozen developers relying on
this so it would be nice find a way with minimal impact to the
users...

For now I'll do the rebasing in a back-level git client...

- Fred
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]