Problem with git-svn

From: John Wiegley <hidden>
Date: 2016-06-15 22:43:08

Hello,

I've been using git-svn for a couple of weeks now quite happily.   
Then the other day I decided to start using "git-clone -l ..." in  
order to create a few concurrent topic branches.  I then moved to my  
canonical repository and did a "pull" from many of these topic branches.

So now I have a master git repository that reflects all of my  
accumulated work.  I want to reflect this up to my subversion  
repository.  However, it seems that doing all of that cloning and  
pulling has screwed up git-svn's tracking.  I get this error now when  
I try to dcommit:

Unable to extract revision information from commit  
865da18a70e8e93b1776864c73581198028e1190~1

The refid it's complaining about represents a pull of three changes  
from one of those topic branches:

commit 865da18a70e8e93b1776864c73581198028e1190
Merge: 42b0b95... f25fcef...
Author: John Wiegley [off-list ref]
Date:   Thu May 3 00:17:17 2007 -0600

     Merge branch 'master' of /Users/johnw/src/ledger/master/

The refids that this refers to are also in my log, all with version  
information and log comments.

How do I get git-svn past this point?  I can't find any command that  
will make it functional again.  The last time this happened I just  
wiped my git repository and rebuilt it from scratch; but since people  
are tracking my git repository now, I'd rather now have to reset all  
of my refids (not to mention the sheer amount of time that it takes).

Thank you,
   John
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help