Created
October 7, 2010 21:19
-
-
Save dball/615900 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Donalds-Decisiv-MacBook-Pro:pricing-trunk dball$ git svn rebase | |
M test/unit/estimate_item_test.rb | |
M app/helpers/operations_helper.rb | |
M app/models/estimate_item.rb | |
M app/models/portal/group.rb | |
M app/concerns/broker_concerns.rb | |
M app/concerns/estimate_concerns.rb | |
M app/concerns/group_note_concerns.rb | |
M app/views/leftnav/_warranty_info.html.erb | |
Byte order is not compatible at ../../lib/Storable.pm (autosplit into ../../lib/auto/Storable/_retrieve.al) line 380, at /opt/local/lib/perl5/5.8.9/Memoize/Storable.pm line 21 | |
Could not unmemoize function `lookup_svn_merge', because it was not memoized to begin with at /opt/local/libexec/git-core/git-svn line 3178 | |
END failed--call queue aborted at /opt/local/libexec/git-core/git-svn line 39. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I got the same thing. I managed to get past it by using the git-svn Perl script from Git 1.6.5.7, per http://kerneltrap.org/mailarchive/git/2010/1/13/20137, and invoking it thus:
$ perl -I /usr/local/git/lib/perl5/site_perl/ ~/temp/git-svn.pl rebase