On 31 May 2010 13:09, Fred <fred@xxxxxxxxxxx> wrote:
> 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
>
Additional info:
$ git log --grep=^git-svn-id --first-parent
returns mulitple commits - the first one here:
commit e2f9e115f07fa1fb0932f893c6f94173f9dc4515
Author: geir <geir@f9caaf5b-9695-4c42-8d37-d0d3d7799616>
Date: Mon Apr 26 12:37:09 2010 +0000
Modofied search for ED01119000 from web. Handles the case that the
user enters the birth date as a complete ssn or as 8 digits in
git-svn-id: svn://svnserver/Decision/decisionmaker/trunk@45839
f9caaf5b-9695-4c42-8d37-d0d3d7799616
----
And here is the config-file - only changed the github username to xxx
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[svn-remote "svn"]
url = svn://svnserver/
fetch = Decision/decisionmaker/trunk:refs/remotes/trunk
branches = Decision/decisionmaker/branches/*:refs/remotes/*
tags = Decision/decisionmaker/tags/*:refs/remotes/tags/*
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git@xxxxxxxxxx:xxx/decisionmaker.git
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "subversion"]
remote = origin
merge = refs/heads/subversion
---
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html