Package: git-svn
Version: 1:1.7.10-1
Severity: important
Dear Maintainer,
I was working in my git repository on a feature, and when it was done,
I tried to push a series of ~10 commits to SVN by running
$ git svn dcommit
After several successful commits, I got the message:
"""
r6698 = d0fd92e1ee64d235aac15e027c07441ca800d939 (refs/remotes/git-svn)
W: 324dfba2492b5862db452dc062f8f0461a3b6d22 and refs/remotes/git-svn differ,
using rebase:
:040000 040000 62a1df591aa5be8f65385f079e88a8bb8158cd99
c355c087fc649e15c849afb671d570f9cc227fb7 M one-of-my-folders
Cannot rebase: You have unstaged changes.
Please commit or stash them.
rebase refs/remotes/git-svn: command returned error: 1
"""
(one-of-my-folders is not a real name, it was a folder in the repository).
After this, the working tree still had the latest version of the code, but
all the previous commits on master were gone. At first I tried to
$ git rebase --continue
But git just said:
No rebase in progress?
It seems I had no choice left but to commit the changes as one, and then
dcommit.
Marked important because, really, this is data loss.
Thanks,
Shai.
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-svn depends on:
ii git 1:1.7.10-1
ii libsvn-perl 1.6.17dfsg-4
ii libterm-readkey-perl 2.30-4+b2
ii libwww-perl 6.04-1
git-svn recommends no packages.
Versions of packages git-svn suggests:
ii git-doc <none>
ii subversion 1.6.17dfsg-4
-- no debconf information
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
