[Dune-devel] YaspGrid + git svn

[Oliver Sander]

Hi Steffen,
that sounds exactly like what I would have needed this morning.  Thanks 
a lot --
I'll pin it to my wall in bright red colors.
best,
Oliver

Am 13.11.2012 10:28, schrieb Steffen Müthing:
> Hi Oli,
>
> yes, I had that happen to me (for a different reason, one of the commits was rejected by a SVN
> commit hook in PDELab) - git svn just gives up and leaves a mess.
>
> You'll first have to get your branch back to where it was before starting the dcommit - the reflog
> can help you there. "git reflog<branchname>" shows you all the commits your branch has recently
> pointed to. Just look for the log message of the last commit you made before running the dcommit,
> take the sha1 (or the<branchname>@{…} bit) and run "git reset --hard<sha1 or that other thing>". That
> resets *everything* to that revision - your branch, the index and the working tree - and will thus
> destroy any changes that were not committed before the dcommit, but normally your working directory
> should be clean anyway before running the dcommit.
> Now when you run "git svn rebase", git should pick up the commits already in svn and leave you with
> only the uncommitted changes on top of those, and you can run "git svn dcommit" again.
>
> Hope that helps,
>
> Steffen
>
>
> Am 13.11.2012 um 09:48 schrieb Oliver Sander:
>
>> Dear Dune,
>> as you may have noticed I have done a bit of YaspGrid cleaning.
>> Don't hate me if I broke anything.
>>
>> The last few commits are a bit unclean, as the consequence of
>> yet another git svn f***up.  Does anybody know what to do when
>> a lengthy git svn dcommit gets interrupted by a failing internet
>> connection?
>>
>> cheers,
>> Oliver
>>
>> _______________________________________________
>> Dune-devel mailing list
>> Dune-devel at dune-project.org
>> http://lists.dune-project.org/mailman/listinfo/dune-devel
> Steffen Müthing
> Universität Stuttgart
> Institut für Parallele und Verteilte Systeme
> Universitätsstr. 38
> 70569 Stuttgart
> Tel: +49 711 685 88429
> Fax: +49 711 685 88340
> Email: steffen.muething at ipvs.uni-stuttgart.de
>