• Post Reply
  • Bookmark Topic Watch Topic
  • New Topic

Multibranch development with SVN

 
Pradeep Bhat
Greenhorn
Posts: 29
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
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
Pie
Posts: 18277
56
Android Eclipse IDE Linux
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
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.
 
Peter Johnson
author
Bartender
Posts: 5852
7
Android Eclipse IDE Ubuntu
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
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!
 
Pradeep Bhat
Greenhorn
Posts: 29
  • Mark post as helpful
  • send pies
  • Quote
  • Report post to moderator
Thanks Tim & Peter.
 
  • Post Reply
  • Bookmark Topic Watch Topic
  • New Topic