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).
We have another branch Z (totally new code)
If this is new code, i.e. code not related to any existing code, it wouldn't be called a branch. The difference is that operations like branch and merge are between related 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 ?
You would copy the new code from Z into the branch Y and later merge the trunk with branch Y. Merging changes from branch Y includes things like the file copied from Z, so this should work.
To me, Z looks like a separate project. Copying it into a branch of a different project is a bit uncommon, so the normal conventions of branching and merging don't cover this case. If you want to keep this as separate project, too, consider using e.g. externals.
When do we decide to svn copy or svn merge for branch Z ?
Normally, creating a branch means making a copy. Later, you only merge, both directions from the branch to trunk and from trunk to the branch are possible and common. Your case of copying Z into another project isn't covered by the typical use cases.
I hope this helped and didn't add to your confusion! ;) Uli ************************************************************************************** Domino Laser GmbH, Fangdieckstra�e 75a, 22547 Hamburg, Deutschland Gesch�ftsf�hrer: Hans Robert Dapprich, Amtsgericht Hamburg HR B62 932 ************************************************************************************** Visit our website at http://www.dominolaser.com ************************************************************************************** Diese E-Mail einschlie�lich s�mtlicher Anh�nge ist nur f�r den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empf�nger sein sollten. Die E-Mail ist in diesem Fall zu l�schen und darf weder gelesen, weitergeleitet, ver�ffentlicht oder anderweitig benutzt werden. E-Mails k�nnen durch Dritte gelesen werden und Viren sowie nichtautorisierte �nderungen enthalten. Domino Laser GmbH ist f�r diese Folgen nicht verantwortlich. **************************************************************************************
