From: Fred <fred@akafred.com>
To: git@vger.kernel.org
Subject: Fwd: git+svn - repo upgrade from 1.6.6.4 to 1.7.1 fails
Date: Mon, 31 May 2010 13:09:54 +0200 [thread overview]
Message-ID: <AANLkTikYYjl6Gv8SRMvtmzW1pyzkyu_mwLyEGHdWuH00@mail.gmail.com> (raw)
In-Reply-To: <AANLkTin-k5zIDZysiLbTusqDwqxGWDxxAOPljLuRlIMD@mail.gmail.com>
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
next parent reply other threads:[~2010-05-31 11:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <AANLkTin-k5zIDZysiLbTusqDwqxGWDxxAOPljLuRlIMD@mail.gmail.com>
2010-05-31 11:09 ` Fred [this message]
2010-05-31 12:27 ` git+svn - repo upgrade from 1.6.6.4 to 1.7.1 fails Fred
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTikYYjl6Gv8SRMvtmzW1pyzkyu_mwLyEGHdWuH00@mail.gmail.com \
--to=fred@akafred.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).