Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

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

Tags:

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.

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

like image 441
Sylar Avatar asked Nov 22 '10 09:11

Sylar


2 Answers

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

  • 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 --depth option is new in 1.5 and restricts operation of Subversion subcommands to a certain depth within the target working copy or URL.

This is more detailed than the Subversion documentation on merge.

alt text

like image 98
VonC Avatar answered Oct 04 '22 03:10

VonC


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.

like image 26
Dialecticus Avatar answered Oct 04 '22 01:10

Dialecticus