When to merge or copy - quick question

2013-07-11 Thread Z W
Hi All We have a trunk X and a feature branch Y (branched from X) We have another branch Z (totally new code) and we need to copy branch Z to inside branch Y When we need to merge from branch Y to X, will it work ? When do we decide to svn copy or svn merge for branch Z ? Thank

Re: When to merge or copy - quick question

2013-07-16 Thread Ulrich Eckhardt
Am 12.07.2013 01:43, schrieb Z W: We have a trunk X and a feature branch Y (branched from X) Your wording is a bit confusing. Let me try to rephrase this: You have a project X which has a trunk and a branch Y. The point is that a trunk is implied (and typically named "trunk" in the repository

Re: When to merge or copy - quick question

2013-07-19 Thread Z W
Hi Uli Thanks for responding with your detailed answers. I would take your suggestion to copy Z branch into Y and then merge Y into Trunk. I'm not sure what externals are for. Another question: Under what circumstance would one use "svn switch". I understand what it can do but I still don't see

Re: When to merge or copy - quick question

2013-07-19 Thread Les Mikesell
On Fri, Jul 19, 2013 at 1:22 PM, Z W wrote: > > Thanks for responding with your detailed answers. > I would take your suggestion to copy Z branch into Y and then merge Y into > Trunk. > > I'm not sure what externals are for. Externals are for where you want a component to appear within one or mor