Some weeks ago Openbravo subversion repository was upgraded to version 1.5.
The greatest feature this new version has is the merge tracking. From now on it is not necessary to manually have into account the revisions that have already been merged between branches.
Now merging is as easy as:
myWCbranch$ svn merge https://dev.openbravo.com/svn/openbravo/trunk
This command will merge all the not already merged changes in trunk to my branch working copy. And now the best part: when I’ve finished with by branch, to merge it back to the trunk this command will do all the work:
myWCtrunk$ svn merge --reintegrate https://dev.openbravo.com/svn/openbravo/myBranch
I hope this will save us a lot of headhaches…
There is a new feature personally I don’t like is the the interactive conflict resolution, specially when merging big projects it is annoying to have to manually decide about each conflict while the process has not been finished yet. It is possible to deactivate it editing the
.subversion/config file to add in the
[miscellany] section the following line:
interactive-conflicts = no
There is some documentation about branches and merges in the Openbravo wiki.