2012年10月_limon758

12月 11月 10月 09月 08月 07月 06月 05月 04月 03月 02月 01月

原创 svn A conflict in the working copy obstructs the current operation

使用svn merge 合并之后,有的文件会显示特殊的冲突 A conflict in the working copy obstructs the current operation A conflict in the working copy obstructs the current operation svn: Commit failed (details follo...

2012-10-18 17:21:52 239

原创 svn Reintegrate can only be used if revisions through were previously merged fro

svn合并的时候,报错 svn: Reintegrate can only be used if revisions 3234 through 4332 were previously merged from svn://xxx.xxx.xx.xx/xxx/xxx/xxx/src to the reintegrate source, but this is not the case:...

2012-10-18 17:08:50 1976

原创 svn 提交的时候 Transaction is out of date

更新一下再提交就好了 Transaction is out of date svn: Commit failed (details follow): svn: Out of date: '/project/test/branches/test' in transaction 'i' eclips控制台提示如上错误解决：这个是由于本地版本与svn上版本不同造成的，更新一...

2012-10-18 16:57:46 146

原创 SVN merge 合并选择svn路径时候报错 Folder '' does exist remotely

Folder '' does exist remotely 在合并的时候,选择了Reintegrate a branch之后,再选择SVN的tag路径的时候,报错 Folder '' does exist remotely,并且点了确定还一直弹出这个警告 [img]http://dl.iteye.com/upload/attachment/0075/3094/3b3c426d-737...

2012-10-18 16:55:51 542