Re: git-svn condenses history when dcommit is interrupted

From: Imran M Yousuf <imyousuf@gmail.com>
Date: May 17, 2008, 04:35 UTC
Message-ID: <7bfdc29a0805162135m2758171dva6a6594239733bd8@mail.gmail.com>
In-Reply-To: <7bf6f1d20805161402m4fa473f5w198bc8cb055eb95f@mail.gmail.com>

>> Whenever my commit is not completed successfully I can thus easily
>> reset, rebase and follow the command sequence again. This way I have

I forgot to mention 'git svn fetch' if the commit succeeds and the update fails

> But that doesn't help with the problem I have faced, which is when
> dcommit fails *after* some change has already been committed to the
> subversion repository. At that point, the local copy of the subversion

Did you try 'git svn fetch' at this point

Show 7 quoted lines

> history is broken since git thinks it has got the fetched the
> committed revision but it's not in the history.
> ....
> I think this is a bug with git-svn that should be fixed and I will
> gladly help fix it in any way I can. Do you think I should be more
> explicit and focus on the broken history instead of the "condensed
> merges"?

It could be a bug but I am not sure, what I am sure of is that I faced a *similar* (not sure identical) problem and 'git reset' and 'git svn fetch' followed by rebase, merge and dcommit was successful in my case.

Best regards,

-- 
Imran M Yousuf
Email: imran@smartitengineering.com
Mobile: +880-1711402557