I spent the entirety of yesterday untangling a mess of subversion branches. What had happened was lots of (3) development branches had been merged into trunk, but not back out into the other branches. This caused some changes to be mising when the branches were merged back into trunk. This happened for 3 different sites repositories.
I’d like a mechanism for alerting or automatically reverse merging from trunk into the active development branches. This “hook” would:
- Alert admins trunk has been updated.
- Perform the reverse merge to active dev branches (provided there are no conflicts).
- Possibly perform fresh export the dev branches after merge?
- Perform a fresh export of trunk to the server for UAT.
This would avoid the situation in future. It has been an interesting excercise which I will not be doing again! Lesson learned.