{"thread":{"id":"23951","subject":"Fwd: git+svn - repo upgrade from 1.6.6.4 to 1.7.1 fails","startedAt":"2010-05-31T11:09:54Z","lastAt":"2010-05-31T12:27:06Z","messageCount":2,"participants":["Fred"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"142605","messageId":"AANLkTikYYjl6Gv8SRMvtmzW1pyzkyu_mwLyEGHdWuH00@mail.gmail.com","threadId":"23951","inReplyTo":"AANLkTin-k5zIDZysiLbTusqDwqxGWDxxAOPljLuRlIMD@mail.gmail.com","subject":"Fwd: git+svn - repo upgrade from 1.6.6.4 to 1.7.1 fails","fromName":"Fred","fromEmail":"fred@akafred.com","sentAt":"2010-05-31T11:09:54Z","receivedAt":"2010-05-31T11:09:54Z","isPatch":false,"sender":{"key":"fred@akafred.com","avatar":null},"body":"Hi, I have a project with two remotes - one git and one svn. One\nbranch is only used for \"git svn rebase\", and then I cherrypick or\nmerge from it into my master branch. Most work is done in the master\nbranch (or other topic branches only available in git)\n\nThe repo was created under git 1.6.6.4. After updating git a while\nback (to 1.7.1) it was time to merge inn a few things from svn - so i\nswitched to my \"subversion\" branch and did a\n\n$ git svn rebase\n\nMigrating from a git-svn v1 layout...\nData from a previous version of git-svn exists, but\n.git/svn\n(required for this version (1.7.1) of git-svn) does not exist.\nDone migrating from a git-svn v1 layout\nUnable to determine upstream SVN information from working tree history\n---\nI read this as: \"I see your repo has some svn stuff and that it is\nbacklevel. I'll fix it for you. Oh shit, now I can't determine what\nsvn revision you are on.\"\n\nAny ideas on how to resolve this? We're a dozen developers relying on\nthis so it would be nice find a way with minimal impact to the\nusers...\n\nFor now I'll do the rebasing in a back-level git client...\n\n- Fred\n"},{"id":"142609","messageId":"AANLkTilTx0Eh5WTxucWRVcvFcFUQoYfauU953pXx-P5N@mail.gmail.com","threadId":"23951","inReplyTo":"AANLkTikYYjl6Gv8SRMvtmzW1pyzkyu_mwLyEGHdWuH00@mail.gmail.com","subject":"Re: git+svn - repo upgrade from 1.6.6.4 to 1.7.1 fails","fromName":"Fred","fromEmail":"fred@akafred.com","sentAt":"2010-05-31T12:27:06Z","receivedAt":"2010-05-31T12:27:06Z","isPatch":false,"sender":{"key":"fred@akafred.com","avatar":null},"body":"On 31 May 2010 13:09, Fred <fred@akafred.com> wrote:\n> Hi, I have a project with two remotes - one git and one svn. One\n> branch is only used for \"git svn rebase\", and then I cherrypick or\n> merge from it into my master branch. Most work is done in the master\n> branch (or other topic branches only available in git)\n>\n> The repo was created under git 1.6.6.4. After updating git a while\n> back (to 1.7.1) it was time to merge inn a few things from svn - so i\n> switched to my \"subversion\" branch and did a\n>\n> $ git svn rebase\n>\n> Migrating from a git-svn v1 layout...\n> Data from a previous version of git-svn exists, but\n> .git/svn\n> (required for this version (1.7.1) of git-svn) does not exist.\n> Done migrating from a git-svn v1 layout\n> Unable to determine upstream SVN information from working tree history\n> ---\n> I read this as: \"I see your repo has some svn stuff and that it is\n> backlevel. I'll fix it for you. Oh shit, now I can't determine what\n> svn revision you are on.\"\n>\n> Any ideas on how to resolve this? We're a dozen developers relying on\n> this so it would be nice find a way with minimal impact to the\n> users...\n>\n> For now I'll do the rebasing in a back-level git client...\n>\n> - Fred\n>\n\nAdditional info:\n\n$ git log --grep=^git-svn-id --first-parent\n\nreturns mulitple commits - the first one here:\n\ncommit e2f9e115f07fa1fb0932f893c6f94173f9dc4515\nAuthor: geir <geir@f9caaf5b-9695-4c42-8d37-d0d3d7799616>\nDate:   Mon Apr 26 12:37:09 2010 +0000\n\n    Modofied search for ED01119000 from web. Handles the case that the\nuser enters the birth date as a complete ssn or as 8 digits in\n\n    git-svn-id: svn://svnserver/Decision/decisionmaker/trunk@45839\nf9caaf5b-9695-4c42-8d37-d0d3d7799616\n\n----\n\nAnd here is the config-file - only changed the github username to xxx\n\n[core]\n\trepositoryformatversion = 0\n\tfilemode = true\n\tbare = false\n\tlogallrefupdates = true\n\tignorecase = true\n[svn-remote \"svn\"]\n\turl = svn://svnserver/\n\tfetch = Decision/decisionmaker/trunk:refs/remotes/trunk\n\tbranches = Decision/decisionmaker/branches/*:refs/remotes/*\n\ttags = Decision/decisionmaker/tags/*:refs/remotes/tags/*\n[remote \"origin\"]\n\tfetch = +refs/heads/*:refs/remotes/origin/*\n\turl = git@github.com:xxx/decisionmaker.git\n[branch \"master\"]\n\tremote = origin\n\tmerge = refs/heads/master\n[branch \"subversion\"]\n        remote = origin\n        merge = refs/heads/subversion\n\n---\n"}]}