Frank Terbeck venit, vidit, dixit 01.07.2010 12:19: > Michael J Gruber wrote: > [...] >>> And a unified diff of the two: >>> [snip] >>> --- trash directory.t9119-git-svn-info/actual.info-added-directory 2010-07-01 11:22:16.000000000 +0200 >>> +++ trash directory.t9119-git-svn-info/expected.info-added-directory 2010-07-01 11:22:16.000000000 +0200 >>> @@ -1,6 +1,7 @@ >>> Path: added-directory >>> URL: file:///usr/src/sys/git/t/trash%20directory.t9119-git-svn-info/svnrepo/added-directory >>> Repository Root: file:///usr/src/sys/git/t/trash%20directory.t9119-git-svn-info/svnrepo >>> +Repository UUID: 638d0b70-c7df-46bd-9c56-aff8052b4ab8 >> >> "Nachtigall, ick hör Dir trapsen." [I really don't know how to translate >> this...] > > No need. :) > >> Anyway, this is something I had fixed previously before realizing it >> doesn't need a fix and something else is wrong: >> >> It indicates that Git's svn-bindings (git-svn) use a different svn >> version than the actual "svn". (There used to be a bug where Git was >> wrong about the version of the bindings but that is fixed.) >> >> Do the following agree for you: >> >> git svn --version >> svn --version >> >> Do you have any private copies of svn/svn bindings in your path or perl >> path? > > Okay, it wasn't really a private copy, but you're otherwise > spot-on. Here's what was wrong: Turns out you cc'ed the right persons :) > > I didn't realise, `git-svn' was using Perl's subversion bindings. This > happens on my laptop which runs debian stable (lenny). I was upgrading > my subversion package to the one provided by backports.org (a service > that provides backports of newer versions of certain software packages > to debian stable). While that worked nicely, the subversion bindings for > Perl are provided by a package called `libsvn-perl' which was kept at > the version in stable, which is 1.5.1. Backports.org also provides an > upgrade for that package. Now both "svn --version" and "git svn > --version" report the same subversion version and the test passes again. > > > Maybe it would be good if git-svn or maybe just the test suite checked > whether subversion's and the Perl binding's version matched? Then you would not be able to use git-svn with your setup! Having svn and its bindings at different versions is perfectly fine for git-svn: it uses and cares about the bindings only (and adjusts according to the binding's version). It's only the test suite which cares, because it tries to make sure that "svn" and "git-svn" behave as similar as possible. We should probably check in the test suite before triggering false alarms, I'll look into that. Cheers, Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html