Thread (1 message) 1 message, 1 author, 2016-06-15

Re: git-svn condenses history when dcommit is interrupted

From: Imran M Yousuf <hidden>
Date: 2016-06-15 22:44:37

quoted
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
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help