Pascal Obry <pascal@xxxxxxxx> wrote: > Eric, > >> Also, any chance you have multiple refs with "trunk" in the basename? >> >> git rev-parse --symbolic --all | grep '/trunk' > > This reports: > > $ git rev-parse --symbolic --all | grep '/trunk' > refs/remotes/svn/trunk Pascal, OK, this is normal. >> It could be a backwards compatibility issue with git svn looking >> in multiple places for trunk. > > But I have multiple trunk: > > $ ls .git/svn/svn/trunk/ > ./ ../ .rev_map.936e1b1b-40f2-da11-902a-00137254ae57 unhandled.log > > $ ls .git/svn/refs/remotes/svn/trunk/ > ./ ../ .rev_map.936e1b1b-40f2-da11-902a-00137254ae57 unhandled.log > > Removing all the .rev_map* fix the problem. > > Removing only the one in .git/svn/refs/remotes/svn/trunk/ fix the > problem too. > >> With Adam's commit, it'll try $GIT_DIR/svn/refs/remotes/trunk/* first >> Then it'll try $GIT_DIR/svn/trunk/* as a fallback. > > Does this means that it was looking first in $GIT_DIR/svn/trunk/* > before? And the confusion come because now it is looking in > $GIT_DIR/svn/refs/remotes/trunk/* first? Yes, but somehow $GIT_DIR/svn/refs/remotes/trunk should not have been created since $GIT_DIR/svn/svn/trunk already existed. Both of those directories existing at the same time should not Did you try an early version of Adam's patch before it made it into git.git by any chance? Or, did you by any chance start a fresh import with a v1.6.5 and then rsync $GIT_DIR to one created with 1.6.4 and not use --delete with rsync? -- Eric Wong -- 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