2017-08-23 40 views
0

我有一个修订58092,我想使它的修订。 58092修订版后,我在trunk文件夹中有4个提交。我试着SVN合并-r 58092:头,但我得到的错误如何在SVN中进行特定修订HEAD?

svn: E205001: Try 'svn help merge' for more information 
svn: E205001: Merge source required 
+0

这些参数是回到前面 - 你需要撤消大于58092的修订版本,而不是重新应用它们。请参阅[这个问题](https://stackoverflow.com/questions/13330011/how-do-i -revert-an-svn-commit)以获取更多信息。 –

回答

1
  1. 你缺少在合并命令源参数。这是命令的签名:merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]

  2. 你不想将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 '.'.