我在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倉庫中?
您可以將其標記爲答案。而且這也會使其他有類似問題的人受益。 –