| Asymetric behavior in branch and merge? [message #726059] |
Fri, 16 September 2011 13:40  |
 Wilbert Alberts
Messages: 209
Registered: June 2010 |
Senior Member |
|
|
Hi,
I can make a branch in 1 step, but how to I merge in 1 step?
A framework I'm developing consists of multiple projects. This has lead to the following repository layout:
framework
+ trunk
| + pr1
| + pr2
| + pr3
+ branches
| + bug27
| + pr1
| + pr2
| + pr3
I create a branch by opening the svn repository viewer, rightclick the trunk and then select "new branch". So with 1 action, i branch 3 projects. Then I create a new workspace and checkout the branch by opening the repository browser, right click the corresponding branch and select "check out as...". By choosing "Find projects in the children of the selected resource" I end up with checking out the involved projects from the branch.
When it comes to merging the branch in the trunk, I create a workspace in the same way I created the one for the branch. So I end up with multiple projects in the root of my workspace. I can select each project individually and merge it with the corresponding one from the branch. However, is there a way of merging all involved projects in the branch with the ones in the workspace? Is there a way of merging the workspace with the trunk (i.s.o. individual workspace projects)?
Greetings,
Wilbert
[Updated on: Fri, 16 September 2011 13:41] Report message to a moderator |
|
|
|
|
Powered by
FUDForum. Page generated in 0.02641 seconds
] 
Search
Help
Register
Login
Home
