permaculture playing cards*
The moose likes IDEs, Version Control and other tools and the fly likes Multibranch development with SVN Big Moose Saloon
  Search | Java FAQ | Recent Topics | Flagged Topics | Hot Topics | Zero Replies
Register / Login
JavaRanch » Java Forums » Engineering » IDEs, Version Control and other tools
Bookmark "Multibranch development with SVN" Watch "Multibranch development with SVN" New topic
Author

Multibranch development with SVN

Pradeep Bhat
Greenhorn

Joined: Jan 12, 2008
Posts: 29
Hi,

My branch structure is as follows:

Base Branch
--- Branch 1
--- Branch 2

I initially had my base branch.
I made 2 identical branches from it i.e. Branch 1 and Branch 2.

2 independent teams are making changes to Branch1 and Branch2,
Now I want to integrate the code changes made in Branch1 and Branch2 into a singe working copy. Identical file might have been modified in both branches.

Can this be achieved. I am currently using the following client.
TortoiseSVN-1.5.9.15518-win32-svn-1.5.6.msi

Regards,
Pradeep.



Tim Holloway
Saloon Keeper

Joined: Jun 25, 2001
Posts: 15958
    
  19

Merging branches always makes me break out in twitchy sweating fits. I've had some bad experiences there.

I'm not someone who lives and dies with my IDE, but in this case, something like Eclipse+svn plugin can be a lot more effective than using Tortoise. It certainly helped me a dew months back.


Customer surveys are for companies who didn't pay proper attention to begin with.
Peter Johnson
author
Bartender

Joined: May 14, 2008
Posts: 5812
    
    7

I seconds Tim's waryness! Merging is a *itch, especially if you have two teams making independent changes to the same source base. A "svn merge" will only do so much, and you will have to manually resolve any conflicts. I hope you have really good unit and integration tests!

I would run a "svn diff" first. Or I would check out both branches and use some tool such as windiff, ediff or SynchronizeIt to view the differences. I would also compare the branches against the original. All of this comparing would help me better plan for the merging of the branches - I would at least know which files were going to cause me the most problems. It is hard to give specific steps because it all really depends on what was changed.

Good luck!


JBoss In Action
Pradeep Bhat
Greenhorn

Joined: Jan 12, 2008
Posts: 29
Thanks Tim & Peter.
 
Don't get me started about those stupid light bulbs.
 
subject: Multibranch development with SVN
 
Similar Threads
How to link CVS with Java
Mercurial 1.9.2: not able to track changes caused by merges
Maximum risk when deleting all svn:mergeinfo properties in Subversion
Dynamic Datasource invocation at runtime in JSF-EJB3-MySql application on Eclipse3.4.1-JBoss5.0.0
One-To-Many bidirectional