eclipse 颠覆性:合并时深度“工作副本”和“递归”之间的区别?

声明:本页面是StackOverFlow热门问题的中英对照翻译,遵循CC BY-SA 4.0协议,如果您需要使用它,必须同样遵循CC BY-SA许可,注明原文地址和作者信息,同时你必须将它归于原作者(不是我):StackOverFlow 原文地址: http://stackoverflow.com/questions/4244005/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me): StackOverFlow

提示:将鼠标放在中文语句上可以显示对应的英文。显示中英文
时间:2020-09-19 15:22:44  来源:igfitidea点击:

Subversive: Difference between depth 'working copy' and 'recursive' when merging?

eclipsesvnsubversive

提问by Sylar

When doing a merge using the Subversive plugin for Eclipse, there is an dropdown box named "depth" where, besides other options, "working copy" and "recursive" can be selected.

使用 Eclipse 的 Subversive 插件进行合并时,有一个名为“depth”的下拉框,除了其他选项外,还可以选择“工作副本”和“递归”。

I always use the default setting "working copy", but I wonder what the difference between "working copy" and "recursive" is. Can someone explain?

我总是使用默认设置“工作副本”,但我想知道“工作副本”和“递归”之间的区别是什么。有人可以解释一下吗?

采纳答案by VonC

It must be similar to the depth optionspresented in TortoiseSVN(also in merge options):

它必须类似于TortoiseSVN 中提供深度选项(也在合并选项中):

  • recursive: entire tree, including all child folders and sub-folders
  • working copy: Retain the depth specified in the working copy. This option is not used in the checkout dialog, but it is the default in all other dialogs which have a depth setting.
  • 递归:整个树,包括所有子文件夹和子文件夹
  • 工作副本:保留工作副本中指定的深度。结帐对话框中不使用此选项,但它是所有其他具有深度设置的对话框中的默认选项。

Note: The --depthoption is new in 1.5 and restricts operation of Subversion subcommands to a certain depth within the target working copy or URL.

注意:该--depth选项是 1.5 中的新选项,它将 Subversion 子命令的操作限制在目标工作副本或 URL 内的某个深度。

This is more detailed than the Subversion documentation on merge.

这比关于 mergeSubversion 文档更详细。

alt text

替代文字

回答by Dialecticus

I think the "working copy" options means "take option with which working copy is checked out". If working copy is checked out with "immediate children", then only immediate children will be merged.

我认为“工作副本”选项的意思是“选择签出工作副本的选项”。如果使用“直接子代”签出工作副本,则只会合并直接子代。