I've looked aorund google and couldn't find anything quite what I was seeking, so I figured I'd ask here...
Basically, assume I have a trunk, which gets updated frequently, but also over time I spawn a dozen brnaches, none of which will ever re-merge back into trunk, they are essentially becoming their own products...
Now imagine, as these branches grow, the trunk continues to change...how would I best re-merge my change sin trunk into potentially dozens of branches, easily???
What is the best practice when doing this? I was thinking of maybe a shell script, but obviously you still need to handle changes which SVN cannot by hand...
Anyone have any experience in managing such a task? What techniques did you use to streamline the operation?
SVN best practice...
Moderator: General Moderators
-
alex.barylski
- DevNet Evangelist
- Posts: 6267
- Joined: Tue Dec 21, 2004 5:00 pm
- Location: Winnipeg
- Ambush Commander
- DevNet Master
- Posts: 3698
- Joined: Mon Oct 25, 2004 9:29 pm
- Location: New Jersey, US
Re: SVN best practice...
Subversion 1.5 will have facilities for keeping track of changes so you don't have to manually specify revision ranges for merges. I've always thought that Subversion merges were very weak. Just... keep track of when the branch was branched from the trunk, and have clear log messages when merges take place of which revisions where merged.
- Maugrim_The_Reaper
- DevNet Master
- Posts: 2704
- Joined: Tue Nov 02, 2004 5:43 am
- Location: Ireland
Re: SVN best practice...
Do you really need a dozen or more branches? I'm not saying you don't (I do
) but it really does complicate things immeasurably. 1.5 will definitely make this way easier. Failing that for now, look up svnmerge which does something similar.