From: Dave Zarzycki <zarzycki@apple.com>
To: git@vger.kernel.org
Subject: git-svn repo in weird state
Date: Thu, 18 Aug 2011 10:14:20 -0400 [thread overview]
Message-ID: <85C67F68-AEF7-4E98-9388-C16BD04A68F8@apple.com> (raw)
I have a local git-svn repository that is now in a weird state and would any tips for how to debug this. Thanks!
davez
$ git --version
git version 1.7.6
$ git checkout master
warning: refname 'master' is ambiguous.
Already on 'master'
$ git show-ref | grep master
d510ee7a969c908a20ab8abab08dd3ad09870508 refs/heads/master
$ git svn rebase
warning: refname 'master' is ambiguous.
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/svn/trunk.
error: Ref refs/heads/master is at d510ee7a969c908a20ab8abab08dd3ad09870508 but expected 014cd21f9f6e88e4515ed99c632308a954085a34
fatal: Cannot lock the ref 'refs/heads/master'.
Could not move back to refs/heads/master
rebase refs/remotes/svn/trunk: command returned error: 1
$
next reply other threads:[~2011-08-18 14:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-18 14:14 Dave Zarzycki [this message]
2011-08-18 14:22 ` git-svn repo in weird state Dave Zarzycki
2011-08-19 9:54 ` Michael J Gruber
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=85C67F68-AEF7-4E98-9388-C16BD04A68F8@apple.com \
--to=zarzycki@apple.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