24.02.2012 23:03, Jonathan Nieder пишет:
Роман Ержуков wrote:
It's not regression. It was after one local git commit, when I
renamed the Java package.
[...]
[svn-remote "svn"]
url = http://svn.dfu.i-teco.ru/projects
fetch = trunk/АС Выплаты:refs/remotes/trunk
branches = branches/АС Выплаты/*:refs/remotes/*
tags = tags/АС Выплаты/*:refs/remotes/tags/*
Thanks.
I tried to reproduce this with git 1.7.9.2 and libsvn1 1.6.17dfsg-3.
At first, I got a different error[*] ("Unable to determine upstream
SVN information"), which turned out to be due to an unrelated bug.
Unsetting "[log] abbrevcommit" in ~/.gitconfig made the error go
away.
Unfortunately after that, "git svn dcommit" works fine.
| $ git svn dcommit
| Committing to file:///tmp/test-repo/trunk/АС Выплаты ...
| M hello.c
| Committed r6
| M hello.c
| r6 = 9747b1cb9cddf37f85da9cce99f17d4507005524 (refs/remotes/trunk)
| No changes between current HEAD and refs/remotes/trunk
| Resetting to the latest refs/remotes/trunk
Reproduction recipe:
svnadmin create /tmp/test-repo
svnadmin load /tmp/test-repo<dump.txt
git init wc
cd wc
git svn init -s file:///tmp/test-repo
sed -i -e '
s,trunk:,trunk/АС Выплаты:,
s,branches/\*:,branches/АС Выплаты/\*:,
s,tags/\*:,tags/АС Выплаты/\*:,
' .git/config
git svn fetch
echo 'hello! 3'>hello.c
git commit -a -m test
git svn dcommit
No assertion failure.
$ ldd /usr/lib/i386-linux-gnu/libsvn_swig_perl-1.so.1 | grep libsvn
libsvn_delta-1.so.1 => /usr/lib/i386-linux-gnu/libsvn_delta-1.so.1
(0xb7701000)
libsvn_subr-1.so.1 => /usr/lib/i386-linux-gnu/libsvn_subr-1.so.1
(0xb76ae000)
$ sha1sum /usr/lib/i386-linux-gnu/libsvn_subr-1.so.1
8ce873afadd6910a764a2539e59e64c2158ba437
/usr/lib/i386-linux-gnu/libsvn_subr-1.so.1
Ideas?
Jonathan
[*]
$ git svn dcommit
Use of uninitialized value $hash in string eq at
/usr/lib/git-core/git-svn line 1899.
Use of uninitialized value $hash in string eq at
/usr/lib/git-core/git-svn line 1899.
Unable to determine upstream SVN information from HEAD history.
Perhaps the repository is empty. at /usr/lib/git-core/git-svn line 780.
It's because this copy of git is missing the fix 83cf21f98 (git-svn:
un-break "git svn rebase" when log.abbrevCommit=true, 2012-02-12).
Hi, Jonathan
Unfortunately, I could not reproduce the bug again. I changed the svn repo
directy after the bug. I thied to commit into new temporary svn repo from git
and repeat same steps, but dcommit was fine.
--
Best regards,
Roman
