开发者

Binary file lost using svn merge

开发者 https://www.devze.com 2023-01-08 01:14 出处:网络
I have two branch (let say branch A and branch B)in my svn repository I\'m done with one of them, branch B

I have two branch (let say branch A and branch B)in my svn repository I'm done with one of them, branch B I want to get changes of the other branch ,branch A. On both branch i have binary files,in a separated folder. When i try to get the new binary files of branch A, i get nothing, just tr开发者_运维问答ee conflict.

I use subclipse, merge a range of revision. The branches was created with svn 1.4. Since the repository was moved to svn 1.6.


In fact it was just a bug in the eclipse 's svn client we need to manually select the revision we want and not let eclipse do it

0

精彩评论

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