* git svn rebase bug
@ 2011-11-08 20:50 Matt Arsenault
2011-11-09 10:40 ` Carlos Martín Nieto
0 siblings, 1 reply; 2+ messages in thread
From: Matt Arsenault @ 2011-11-08 20:50 UTC (permalink / raw)
To: git
There seems to be a bug using git svn rebase with strategies
git version 1.7.7.2
$ git svn rebase --strategy=theirs
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git svn rebase bug
2011-11-08 20:50 git svn rebase bug Matt Arsenault
@ 2011-11-09 10:40 ` Carlos Martín Nieto
0 siblings, 0 replies; 2+ messages in thread
From: Carlos Martín Nieto @ 2011-11-09 10:40 UTC (permalink / raw)
To: Matt Arsenault; +Cc: git
On Tue, Nov 08, 2011 at 03:50:25PM -0500, Matt Arsenault wrote:
> 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.
>
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-09 10:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-08 20:50 git svn rebase bug Matt Arsenault
2011-11-09 10:40 ` Carlos Martín Nieto
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).