Hi Folks, If you have forgot to commit some of the modifications you did in a branch to the trunk (or vice versa), you can use 'SVN merge' command to merge those changes to the corresponding location without manually applying the changes by looking at commit messages which is more effective most of the time.
Assume you want to merge the modifications done in revision xxxxx to branches/3.2.1/core/org.wso2.carbon.user.core/3.2.2 to trunk/core/org.wso2.carbon.user.core. svn merge -c <revision_ number> branches/3.2.1/core/org.wso2.carbon.user.core/3.2.2 trunk/core/org.wso2.carbon.user.core "branches/3.2.1/core/org.wso2.carbon.user.core/3.2.2" and "trunk/core/org.wso2.carbon.user.core" are up-to-date local copies. Then review the changes and commit them. Of course, you will have to go with the manual merging process, if there are conflicts when merging. This is used to manage the Apache Axis branches and trunk effectively. Thanks, Thilina -- Thilina Buddhika Associate Technical Lead WSO2 Inc. ; http://wso2.com lean . enterprise . middleware phone : +94 77 44 88 727 blog : http://blog.thilinamb.com
_______________________________________________ Carbon-dev mailing list Carbon-dev@wso2.org http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev
