Hello folks,
The hibernate-script is maintained in SVN, but we've long tracked it
with Git at git://git.debian.org/git/collab-maint/hibernate.git .
Unfortunately, I seem to have lost the repository I always used to
git-svn-rebase and push new upstream commits to the repository on
git.debian.org.
I am now trying to revive the clone, but git-svn remains "unable to
determine the upstream SVN information from the working tree
history". This baffles me.
Here are my steps:
-8<--8<--8<-
alioth:~|master|% git clone /git/collab-maint/hibernate.git hibernate-svnsync
Initialized empty Git repository in /srv/alioth.debian.org/chroot/home/users/madduck/hibernate-svnsync/.git/
alioth:~|master|% cd hibernate-svnsync
alioth:~/hibernate-svnsync|master|% git branch --no-track upstream origin/upstream
alioth:~/hibernate-svnsync|master|% cat >> .git/config <<_eof
heredoc> [svn-remote "svn"]
heredoc> url = svn+ssh://svn.suspend2.net/svn/hibernate-script
heredoc> fetch = trunk:refs/remotes/upstream/trunk
heredoc> branches = branches/*:refs/remotes/upstream/*
heredoc> tags = tags/*:refs/remotes/upstream/tags/*
heredoc> _eof
alioth:~/hibernate-svnsync|master|% git checkout upstream
alioth:~/hibernate-svnsync|upstream|% git show HEAD | grep git-svn-id
git-svn-id: svn+ssh://svn.suspend2.net/svn/hibernate-script/trunk@1195 c12ee44c-9ede-0310-94ea-d4716f4f7118
-8<--8<--8<-
So the repository is now cloned and the URL is the same as the one
in the HEAD commit message.
But when I try to rebase, I am told:
-8<--8<--8<-
alioth:~/hibernate-svnsync|master|% git svn rebase
Migrating from a git-svn v1 layout...
Data from a previous version of git-svn exists, but
.git/svn
(required for this version (1.5.6.5) of git-svn) does not exist.
Done migrating from a git-svn v1 layout
Unable to determine upstream SVN information from working tree history
-8<--8<--8<-
(I get the same result with Git 1.6.2.3)
I've spend a bit of time with the code, but I cannot figure out why
it has these hiccups. I think it's because git-svn needs a rev-map
file in
.git/svn/upstream/trunk/.rev_map.c12ee44c-9ede-0310-94ea-d4716f4f7118,
which is now gone, but that file is now gone.
Does anyone know how I can revive the git-svn clone? I cannot just
reclone, or else all of the commit IDs in the public upstream branch
would be rewritten.
Thanks,
--
martin | http://madduck.net/ | http://two.sentenc.es/
"alle vorurteile kommen aus den eingeweiden."
- friedrich nietzsche
spamtraps: madduck.bogus@xxxxxxxxxxx
Attachment:
digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)