{"thread":{"id":"28888","subject":"git svn rebase bug","startedAt":"2011-11-08T20:50:25Z","lastAt":"2011-11-09T10:40:56Z","messageCount":2,"participants":["Matt Arsenault","Carlos Martín Nieto"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"179158","messageId":"39110A70-A25E-4A6B-A401-FCCE895B2CE5@rpi.edu","threadId":"28888","inReplyTo":null,"subject":"git svn rebase bug","fromName":"Matt Arsenault","fromEmail":"arsenm2@rpi.edu","sentAt":"2011-11-08T20:50:25Z","receivedAt":"2011-11-08T20:50:25Z","isPatch":false,"sender":{"key":"arsenm2@rpi.edu","avatar":null},"body":"There seems to be a bug using git svn rebase with strategies\n\ngit version 1.7.7.2\n\n\n$ git svn rebase --strategy=theirs\n\nFirst, rewinding head to replay your work on top of it...\n/usr/lib/git-core/git-rebase--merge: line 69: git-merge-theirs: command not found\nUnknown exit code (127) from command: git-merge-theirs deabad54a6d5ce3ab3f655e06b9c24eadbba6f6c^ -- HEAD deabad54a6d5ce3ab3f655e06b9c24eadbba6f6c\nrebase --strategy=theirs refs/remotes/git-svn: command returned error: 1"},{"id":"179200","messageId":"20111109104056.GB3409@beez.lab.cmartin.tk","threadId":"28888","inReplyTo":"39110A70-A25E-4A6B-A401-FCCE895B2CE5@rpi.edu","subject":"Re: git svn rebase bug","fromName":"Carlos Martín Nieto","fromEmail":"carlos@cmartin.tk","sentAt":"2011-11-09T10:40:56Z","receivedAt":"2011-11-09T10:40:56Z","isPatch":false,"sender":{"key":"carlos@cmartin.tk","avatar":"https://gravatar.com/avatar/956bfe8371004f2960febf266a6af789f60cdc01fbae48bb151ad4c9b532c3a2?d=mp&s=160"},"body":"On Tue, Nov 08, 2011 at 03:50:25PM -0500, Matt Arsenault wrote:\n> There seems to be a bug using git svn rebase with strategies\n> \n> git version 1.7.7.2\n> \n> \n> $ git svn rebase --strategy=theirs\n\nENOENT. The \"theirs\" strategy doesn't exist (there is an \"ours\"\nstrategy). \"Theirs\" in a option to the recursive merge strategy.\n\n> \n> First, rewinding head to replay your work on top of it...\n> /usr/lib/git-core/git-rebase--merge: line 69: git-merge-theirs: command not found\n> Unknown exit code (127) from command: git-merge-theirs deabad54a6d5ce3ab3f655e06b9c24eadbba6f6c^ -- HEAD deabad54a6d5ce3ab3f655e06b9c24eadbba6f6c\n> rebase --strategy=theirs refs/remotes/git-svn: command returned error: 1\n\nThe bug is the failure to detect that the merge strategy doesn't\nexist, but your command wouldn't have worked anyway.\n\n   cmn\n"}]}