2017-10-18 234 views
0

我在Ubuntu 14.04上,git-svn版本1.9.1(svn 1.8.8)。我试图克隆https://sourceforge.net/p/searchmonkey/code/HEAD/tree/,使用:git svn - 获取缺少的svn提交?

git svn clone https://svn.code.sf.net/p/searchmonkey/code -T trunk -b branches -t tags --prefix=origin/ searchmonkey-code-svngit 

这个过程结束这样的:

... 
r850 = 3b98c1c32c0043184313828780c02ed7c2d85a7e (refs/remotes/origin/shawno) 
    M searchmonkey_2_x_x/util.h 
    M searchmonkey_2_x_x/mainwindow.ui 
    M searchmonkey_2_x_x/tab.cpp 
    M searchmonkey_2_x_x/mapped.cpp 
    M searchmonkey_2_x_x/find.h 
    M searchmonkey_2_x_x/grep.cpp 
    M searchmonkey_2_x_x/matcher.cpp 
    M searchmonkey_2_x_x/matcher.h 
    M searchmonkey_2_x_x/mainwindow.cpp 
r851 = b3fe25fdacad270432f1a2f7b5876b83b54d2387 (refs/remotes/origin/shawno) 
Checked out HEAD: 
    https://svn.code.sf.net/p/searchmonkey/code/trunk r365 
error closing pipe: Bad file descriptor at /usr/lib/git-core/git-svn line 0. 
error closing pipe: Bad file descriptor at /usr/lib/git-core/git-svn line 0. 

现在,当我cd searchmonkey-code-svngit和问题gitk --all,我看到最新的提交是r851,而我已经重置master。所以,现在的状态是:

$ git svn info 
Path: . 
URL: https://svn.code.sf.net/p/searchmonkey/code/branches/shawno 
Repository Root: https://svn.code.sf.net/p/searchmonkey/code 
Repository UUID: 937bcc44-791b-0410-a411-b6e56c9656c8 
Revision: 851 
Node Kind: directory 
Schedule: normal 
Last Changed Author: shawno 
Last Changed Rev: 851 
Last Changed Date: 2011-05-06 04:01:08 +0200 (Fri, 06 May 2011) 
$ git status 
On branch master 
nothing to commit, working directory clean 
$ git log -1 
commit b3fe25fdacad270432f1a2f7b5876b83b54d2387 
Author: shawno <[email protected]> 
Date: Fri May 6 02:01:08 2011 +0000 

    minor changes before move working copy to non-system drive 

    git-svn-id: https://svn.code.sf.net/p/searchmonkey/code/branches/[email protected] 937bcc44-791b-0410-a411-b6e56c9656c8 
$ git svn log -1 
------------------------------------------------------------------------ 
r851 | shawno | 2011-05-06 04:01:08 +0200 (Fri, 06 May 2011) | 2 lines 

minor changes before move working copy to non-system drive 

------------------------------------------------------------------------ 

...但是,sourceforge上页说:

标签2011-05-07 shawno [R852] 2.0.1从来没有发布

...所以,基本上,我从这个项目的Sourceforge svn中错过了r852,因为git svn克隆的最后一个是r851。我试着做:

$ git svn fetch 
$ git svn rebase 
Current branch master is up to date. 
creating empty directory: install_msi/cache.upx/tmp 
creating empty directory: sm_no_gui/release 
$ git svn rebase 
Current branch master is up to date. 

...而且仍然是,最新的提交是r851。

我该如何将缺少的r852提交到这个git svn仓库中?

回答

0

嗯,我想我明白了:如果我点击[r852] 2.0.1 never got released,那么我可以看到:

去除/tags/searchmonkey_v2.0.1 /tags/searchmonkey_v2.0.1 文件已被删除。

...所以这是一个条目,说一个文件被删除;否则就https://sourceforge.net/p/searchmonkey/code/852/tree/,在branches项说:

分行2011-05-06 shawno [r851]移动工作拷贝到非年代以前小的变化...

...所以事实上, r851 的最新版本 - 所以,一切都很好...

+0

您可以将其标记为答案。而且这也会使其他有类似问题的人受益。 –

0

SVN提交,删除标记或分支将不可见作为提交git-svn克隆。但是你应该看到效果,因为标签或分支应该被删除或至少重命名为表明它已被删除的东西,我不是100%确定的。