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

Re: git svn rebase bug

From
Carlos Martín Nieto <carlos@cmartin.tk>
Date
Nov 9, 2011, 10:40 UTC
Message-ID
<20111109104056.GB3409@beez.lab.cmartin.tk>
In-Reply-To
<39110A70-A25E-4A6B-A401-FCCE895B2CE5@rpi.edu>
On Tue, Nov 08, 2011 at 03:50:25PM -0500, Matt Arsenault wrote:
Show 6 quoted lines
> There seems to be a bug using git svn rebase with strategies
> 
> git version 1.7.7.2
> 
> 
> $ git svn rebase --strategy=theirs

ENOENT. The "theirs" strategy doesn't exist (there is an "ours" strategy). "Theirs" in a option to the recursive merge strategy.

Show 5 quoted lines
> 
> First, rewinding head to replay your work on top of it...
> /usr/lib/git-core/git-rebase--merge: line 69: git-merge-theirs: command not found
> Unknown exit code (127) from command: git-merge-theirs deabad54a6d5ce3ab3f655e06b9c24eadbba6f6c^ -- HEAD deabad54a6d5ce3ab3f655e06b9c24eadbba6f6c
> rebase --strategy=theirs refs/remotes/git-svn: command returned error: 1

The bug is the failure to detect that the merge strategy doesn't exist, but your command wouldn't have worked anyway.

   cmn
Previous: Matt Arsenault
Message 2 of 2 in “git svn rebase bug”
  1. Matt ArsenaultNov 8, 2011
  2. Carlos Martín NietoNov 9, 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.