开发者

SVN Copy or Merge: Whats best in current situation!

开发者 https://www.devze.com 2022-12-21 20:24 出处:网络
Check out the following scenario: /trunk at version: 200 /branches/mybranch at version: 200 /branches/mybranch Last commit version: 192

Check out the following scenario: /trunk at version: 200 /branches/mybranch at version: 200 /branches/mybranch Last commit version: 192

Now i want the latest code (exact copy) of /trunk to /branches/mybranch. What is the best option to get the exact copy?? I tried Merge f开发者_C百科rom revision 192-200, but i always missied some files from /trunk. I am not sure which rev. i am missing!!!

How can i get the latest copy exact code???


100% of exact trunk code? Close (disregard) your current branch and start a new one.


Just because your branch had its last commit at revision 192 doesn't mean it has all the changes from Trunk since 192. Look at your logs and see when the last time your branch was merged with Trunk, and merge from that revision to 200.


If I understand the question correctly, you want to replace the branch "mybranch" with the current content from "trunk".

So, just do an svn delete on the branch, and then copy the trunk to mybranch again.


I found the best way is to
-right click /trunk
-tortoisesvn > export to somewhere
-Copy exported files and paste into /branches/mybranch

0

精彩评论

暂无评论...
验证码 换一张
取 消