0
我有一個修訂58092,我想使它的修訂。 58092修訂版後,我在trunk文件夾中有4個提交。我試着SVN合併-r 58092:頭,但我得到的錯誤如何在SVN中進行特定修訂HEAD?
svn: E205001: Try 'svn help merge' for more information
svn: E205001: Merge source required
我有一個修訂58092,我想使它的修訂。 58092修訂版後,我在trunk文件夾中有4個提交。我試着SVN合併-r 58092:頭,但我得到的錯誤如何在SVN中進行特定修訂HEAD?
svn: E205001: Try 'svn help merge' for more information
svn: E205001: Merge source required
你缺少在合併命令源參數。這是命令的簽名:merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]
。
你不想將rev 58092-HEAD應用到你的工作副本,你想刪除它。因此,請嘗試-r HEAD:58092。
綜上所述,我認爲這應該工作(假設你在你的分支的根
svn merge -r HEAD:58092 .
這裏是SOURCE
一些更多的信息:
SOURCE specifies the branch from where the changes will be pulled, and
TARGET_WCPATH specifies a working copy of the target branch to which
the changes will be applied. Normally SOURCE and TARGET_WCPATH should
each correspond to the root of a branch. (If you want to merge only a
subtree, then the subtree path must be included in both SOURCE and
TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)
SOURCE is usually a URL. The optional '@REV' specifies both the peg
revision of the URL and the latest revision that will be considered
for merging; if REV is not specified, the HEAD revision is assumed. If
SOURCE is a working copy path, the corresponding URL of the path is
used, and the default value of 'REV' is the base revision (usually the
revision last updated to).
TARGET_WCPATH is a working copy path; if omitted, '.' is generally
assumed. There are some special cases:
- If SOURCE is a URL:
- If the basename of the URL and the basename of '.' are the
same, then the differences are applied to '.'. Otherwise,
if a file with the same basename as that of the URL is found
within '.', then the differences are applied to that file.
In all other cases, the target defaults to '.'.
- If SOURCE is a working copy path:
- If the source is a file, then differences are applied to that
file (useful for reverse-merging earlier changes). Otherwise,
if the source is a directory, then the target defaults to '.'.
這些參數是回到前面 - 你需要撤消大於58092的修訂版本,而不是重新應用它們。請參閱[這個問題](https://stackoverflow.com/questions/13330011/how-do-i -revert-an-svn-commit)以獲取更多信息。 –