Package: git-svn
Version: 1:1.6.5-1
Severity: important
Hello,
If the network fails during dcommit, git svn gets totally screwed up.
It will give you the prompt back with HEAD pointing to the last SVN-pushed
commit, and the next one applied and not git-committed.
$ git svn dcommit
Committing to svn+ssh://bgog...@scm.gforge.inria.fr/svn/knem/branches/rma ...
M common/knem_io.h
Committed r237
M common/knem_io.h
r237 = f839e16b94052f8b71aa4b66124b37a8337182e0 (refs/remotes/rma)
No changes between current HEAD and refs/remotes/rma
Resetting to the latest refs/remotes/rma
Unstaged changes after reset:
M common/knem_io.h
M driver/linux/knem_main.c
ssh: connect to host scm.gforge.inria.fr port 22: Connection timed out
Use of uninitialized value in concatenation (.) or string at
/usr/lib/perl5/SVN/Core.pm line 584.
Network connection closed unexpectedly: at /usr/lib/git-core/git-svn line 557
Now the only way I found to solve this mess is to git-reset --hard,
git checkout the old HEAD again, and git svn dcommit the remaining stuff.
The big problem is that I don't see any easy way to find the old HEAD.
I had to look back in my terminal history in case there's still the output
of a git log showing the old HEAD commitid.
I don't know how dcommit works internally, but my feeling is that it
should go to a new temporary branch during dcommit. This way, we would
just have to checkout the non-temporary branch on failure. For now,
I do it manually in case the SVN server fails again, but that's really
annoying.
thanks,
Brice
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-rc8=topinambour (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages git-svn depends on:
ii git-core 1:1.6.5-1 fast, scalable, distributed revisi
ii libsvn-perl [libsvn-core-per 1.6.3dfsg-1 Perl bindings for Subversion
ii libterm-readkey-perl 2.30-4 A perl module for simple terminal
ii libwww-perl 5.833-1 Perl HTTP/WWW client/server librar
git-svn recommends no packages.
Versions of packages git-svn suggests:
pn git-doc <none> (no description available)
ii subversion 1.6.3dfsg-1 Advanced version control system
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
