git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git-svn repo in weird state

From
Dave Zarzycki <zarzycki@apple.com>
Date
Aug 18, 2011, 14:14 UTC
Message-ID
<85C67F68-AEF7-4E98-9388-C16BD04A68F8@apple.com>
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: Dave Zarzycki
Message 1 of 3 in “git-svn repo in weird state”
  1. Dave ZarzyckiAug 18, 2011
  2. Dave ZarzyckiAug 18, 2011
  3. Michael J GruberAug 19, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.