scan/replace the following two items:
webss-9999-new-feature
WEBSS-XXX
Checkout new copy of feature to your VM
svn co http://halsvn01/svn/hal/branches/features/webss-9999-new-feature
Merge feature with trunk
svn merge http://halsvn01/svn/hal/trunk
Commit Merge
svn commit -m "Sync feature branch webss-9999-new-feature with trunk. Fix WEBSS-XXX"
Checkout new copy of trunk
svn co http://halsvn01/svn/hal/trunk
Merge Code via Command Line
svn merge --reintegrate http://halsvn01/svn/hal/branches/features/webss-9999-new-feature
svn commit -m "Reintegrate feature branch webss-9999-new-feature into trunk. Fix WEBSS-XXX"
Delete Feature Branch After Successful Merge (why so quick to delete?)
svn delete http://halsvn01/svn/hal/branches/features/webss-9999-new-feature -m "Feature merged to trunk, deleting for cleanup"
Problems Encountered?
If there is a problem with merge-info where Subversion is saying there are "Missing range errors", then you should check to see if there is merge info on files or folders other than just the parent folder. See here.
You can resolve conflicts with the switch --accept=working, which takes the working copies version of things. When we originally started using SVN, the meta data became out of sync due to folks checking in individual files inside Eclipse, instead of checking in their entire feature branch. Here's an example of usage:
svn resolve --accept=working halwebsite/com
Merge Code via Eclipse
- In the IDE, go to File >> Import >> Maven >> Import Existing Maven Project & import the RC project
- Right click the hal-parent (the dir might be named after the RC, so 12.17-RC) and say merge
- Select the reintegrate radio option
- Review the changes
- If okay, commit the changes from command line