svn主干和分支的切换

绝地灬酷狼 2024-02-17 18:24 48阅读 0赞

svn在分支和主干之间切换，会根据本地代码和svn（分支上或者主干上）上的代码不同进行更新操作（增、删、改）。观察日志可以看到有相应的操作。

这是本地(此时除了本地修改的代码，本地代码和主干svn上的代码一样)相对于分支（svn）上的代码做的更新操作。

switch svn://120.25.99.205/svnrepos/bill/03\_Develop/04\_SourceCode/bill E:/workspace/bill -r HEAD --force

D E:/workspace/bill/test/com/eric/java/ericzone/xwsms

D E:/workspace/bill/test/com/eric/java/ericzone/ymsms

U E:/workspace/bill/src/hibernate.properties

U E:/workspace/bill/src/applicationContext.xml

U E:/workspace/bill/src/com/eric/java/basecontainer/spring/SysInit.java

D E:/workspace/bill/src/com/eric/java/basecontainer/basetool/SMSYMUtil.java

D E:/workspace/bill/src/com/eric/java/basecontainer/basetool/SMSXWHTTPUtil.java

D E:/workspace/bill/src/com/eric/java/basecontainer/basetool/SMSXWUtil.java

D E:/workspace/bill/src/com/eric/java/basecontainer/basetool/ymsms

U E:/workspace/bill/src/com/eric/java/basecontainer/basetool/UUIDUtil.java

U E:/workspace/bill/src/com/eric/java/basecontainer/basetool/SMSUtil.java

D E:/workspace/bill/src/com/eric/java/basecontainer/baseweb/YMay.java

U E:/workspace/bill/src/com/eric/java/basecontainer/common/BaseSignConstant.java

U E:/workspace/bill/src/com/eric/java/ericzone/awares/IBranchAware.java

U E:/workspace/bill/src/com/eric/java/ericzone/services/BranchService.java

U E:/workspace/bill/src/com/eric/java/ericzone/services/SalespersonService.java

U E:/workspace/bill/src/com/eric/java/ericzone/action/mt/MtSalespersonUpdateAction.java

U E:/workspace/bill/src/com/eric/java/ericzone/action/mt/MtSalespersonAddAction.java

U E:/workspace/bill/src/com/eric/java/ericzone/action/mt/MtBranchAddSaveAction.java

U E:/workspace/bill/src/com/eric/java/ericzone/action/mt/MtSalespersonAddSaveAction.java

U E:/workspace/bill/src/com/eric/java/ericzone/action/m/MJsonSmsSaveAction.java

D E:/workspace/bill/web/WEB-INF/lib/protobuf-java-2.4.1.jar

D E:/workspace/bill/web/WEB-INF/lib/xstream-1.3.1.jar

D E:/workspace/bill/web/WEB-INF/lib/postmsg-ump-2.4.jar

D E:/workspace/bill/web/WEB-INF/lib/xpp3\_min-1.1.4c.jar

U E:/workspace/bill/web/WEB-INF/mgt/mgtsms.jsp

Updated to revision 2568.

===== File Statistics: =====

Deleted: 11

Updated: 15

这是本地(此时除了本地修改的代码，本地代码和分支svn上的代码一样)相对于主干（svn）上的代码做的更新操作。

switch svn://120.25.99.205/svnrepos/bill/03\_Develop/04\_SourceCode/branches/Bill2016110701 E:/workspace/bill -r HEAD --force

A E:/workspace/bill/test/com/eric/java/ericzone/xwsms

A E:/workspace/bill/test/com/eric/java/ericzone/xwsms/PostMsgTest.java

A E:/workspace/bill/test/com/eric/java/ericzone/ymsms

A E:/workspace/bill/test/com/eric/java/ericzone/ymsms/SDKClientTest.java

U E:/workspace/bill/src/hibernate.properties

U E:/workspace/bill/src/applicationContext.xml

U E:/workspace/bill/src/com/eric/java/basecontainer/spring/SysInit.java

U E:/workspace/bill/src/com/eric/java/basecontainer/basetool/UUIDUtil.java

U E:/workspace/bill/src/com/eric/java/basecontainer/basetool/SMSUtil.java

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/SMSYMUtil.java

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/SMSXWHTTPUtil.java

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/SMSXWUtil.java

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/ymsms

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/ymsms/StatusReport.java

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/ymsms/SDKHttpClient.java

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/ymsms/Mo.java

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/ymsms/HttpClientUtil.java

A E:/workspace/bill/src/com/eric/java/basecontainer/basetool/ymsms/HttpUtil.java

A E:/workspace/bill/src/com/eric/java/basecontainer/baseweb/YMay.java