svn 更新不更新 [英] svn update not updating

查看:73
本文介绍了svn 更新不更新的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!

问题描述

这很奇怪.当我进行 Svn 更新时,tortoise 告诉我我在最后一次修订,但到处都有很多感叹号告诉我很多文件不同步.

This is rather weird. When I do a Svn update, tortoise tells me that I am at the last revision, but there are plenty of exclamation marks everywhere telling me that lots of files are out of sync.

我可以删除旧文件,更新,然后获取新版本,但是仅对文件、目录或任何父目录进行 svn 更新都不起作用.

I can delete the old files, update, then get the new version, but a mere svn update on the file, on the directory or any parent directory does not work.

推荐答案

(!) 红色圆圈图标表示修改,而不是不同步em>(我认为 Subversion 中不存在这样的概念).TortoiseSVN 告诉您您有尚未提交到存储库的本地更改.您可以使用SVN 检查修改"上下文菜单检查它们.

The (!) red circle icon means modified, not out of synch (I don't think such concept exists in Subversion). TortoiseSVN is telling you that you have local changes that have not been committed to the repository. You can inspect them with the "SVN Check for modifications" context menu.

/!\ 黄色三角形表示冲突.TortoiseSVN 已经尝试将传入的修改合并到您的工作副本中,但它失败了,因为它们干扰了您未提交的一些本地更改.您可以使用SVN 检查修改"上下文菜单查看冲突,还可以启动 GUI 工具以使用编辑冲突"菜单修复它们.

The /!\ yellow triangle means conflicted. TortoiseSVN already tried to merge incomings modifications into your working copy but it failed because they interfere with some of your uncommitted local changes. You can review conflicts with the "SVN Check for modifications" context menu and you can launch a GUI tool to fix them with the "Edit conflicts" menu.

这篇关于svn 更新不更新的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!

查看全文
登录 关闭
扫码关注1秒登录
发送“验证码”获取 | 15天全站免登陆