git svn fetch为分支多次检索相同的Subversion修订版

Question

我看到git svn fetch在我的Subversion存储库中找到分支时重复检索相同的Subversion修订版.我们使用标准的Subversion存储库布局,顶级/ trunk,/ tags和/ branches目录(git存储库是使用'git svn init -s'创建的).但是,有问题的分支通常是从主干内部的子目录而不是主干创建的副本.

git svn fetch输出通常看起来像这样:

r2537 = d5b22e956157af036d4112e42e8fb927e45758c8 (trunk)
        M       Enterprise/VC/libgc/SymbolVenue.cpp
r2538 = cfed4ca0491da0b732f32bfff72ba678450a0915 (trunk)
Found possible branch point: http://repo/prod_repos/trunk/Enterprise/VC => http://repo/prod_repos/branches/file_conversion, 2523
W: Refspec glob conflict (ref: refs/remotes/scripter@832):
expected path: branches/scripter@832
    real path: trunk/Enterprise/Python
Continuing ahead with trunk/Enterprise/Python
W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: branches/trunk
    real path: trunk
Continuing ahead with trunk
Initializing parent: file_conversion@2523
        A       gc/QuoteService.cpp
        A       gc/TestSuite.h
        A       gc/quote_svc.pro
        A       gc/QuoteService.h
.....

r1 = d349ed8cb2d76596fe2b83224986275be4600fad (QuoteSvcFix442@2698)
        D       gc/FixMessageLogger.h
.....
r5 =
r19 =
r20 = 
.....

我们回到修订版1. git svn fetch然后继续获取修订版,直到它到达创建分支的修订版.

我究竟做错了什么？反正我有没有告诉git svn fetch不能检索它已经拉过的修订版？

Answer 1

我注意到这个问题,因为我得到了同样的错误信息:

W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: branches/trunk
    real path: trunk

原来,.git/config有重复的行似乎混淆了git-svn,如下所示:

[svn-remote "svn"]
...
    branches = project/branches/*:refs/remotes/*
    tags = project/tags/*:refs/remotes/tags/*
    branches = project/branches/*:refs/remotes/*
    tags = project/tags/*:refs/remotes/tags/*

删除那些重复项为我解决了奇怪的git-svn行为,也许对你来说也是如此.我不确定是什么原因导致git-svn首先复制这些信息.我杀了并继续了最初的克隆,这可能是相关的？

Answer 2

删除重复项仍然给我带来了问题.每次重新运行克隆命令时,例如git svn clone svn://.../svnroot --no-metadata -A authors-transform.txt --stdlayout.它为.git/config增加了两行.我不得不删除包含branches = branches /的所有行:refs/remotes /和 tags = tags/:refs/remotes/tags /

保留配置如下所示:

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[svn-remote "svn"]
        noMetadata = 1
        url = svn://.../svnroot
        fetch = trunk:refs/remotes/trunk
[svn]
        authorsfile = /home/users/denn/authors-transform.txt
~