From: "Carlos Martín Nieto" <carlos@cmartin.tk>
To: Matt Arsenault <arsenm2@rpi.edu>
Cc: git@vger.kernel.org
Subject: Re: git svn rebase bug
Date: Wed, 9 Nov 2011 11:40:56 +0100 [thread overview]
Message-ID: <20111109104056.GB3409@beez.lab.cmartin.tk> (raw)
In-Reply-To: <39110A70-A25E-4A6B-A401-FCCE895B2CE5@rpi.edu>
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
prev parent reply other threads:[~2011-11-09 10:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-08 20:50 git svn rebase bug Matt Arsenault
2011-11-09 10:40 ` Carlos Martín Nieto [this message]
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=20111109104056.GB3409@beez.lab.cmartin.tk \
--to=carlos@cmartin.tk \
--cc=arsenm2@rpi.edu \
--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;
as well as URLs for NNTP newsgroup(s).