TortoiseSVN 识别修改后的文件 - 那么为什么 svn diff 报告没有差异?
我有一个使用 TortoiseSVN 签出的文件夹。 如果我将文件的较新版本复制到现有版本控制文件上,TortoiseSVN 会正确识别该文件已被修改。 但是,当我进行“与以前版本的比较”时,它报告“没有差异”。
如果我使用 WinMerge,我可以看到这些文件是不同的。
有谁知道为什么 TortoiseSVN diff 失败?
I have a folder checked out using TortoiseSVN. If I copy a newer version of a file over the existing versioned file, TortoiseSVN correctly identifies that the file is modified.
However when I do a "diff with previous version", it reports "no differences".
If I use WinMerge I can see that the files ARE different.
Does anyone know why the TortoiseSVN diff is failing?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(3)
与上一个命令进行比较与查看工作副本中发生的更改不同。
上一个被定义为工作副本中的版本之前的版本:
如果您没有看到针对 PREVIOUS 的更改,则您的工作副本恢复了 COMMITTED 的更改
Diff with previous is a different command than looking what changed in your workingcopy.
Previous is defined to be the version before the version you have in your workingcopy:
If you don't see changes against PREVIOUS, your workingcopy reverted the changes of COMMITTED
这可能是您的“忽略空白”设置。 如果其中一个设置为 true,而另一个设置为 true,则将发生此行为。
It may be your 'ignore white space' settings. If one is set to true, and this other is not, this behaviour will occur.
文件名有任何改变吗?
我们遇到过一种情况,有人将在工作目录之外编辑的较新版本复制到工作目录中。 TortiseSVN 标记文件已更改,但无法比较它。 结果原始工作副本被命名为“configfile.txt”,他将其重命名为“ConfigFile.txt”以使其更具可读性。 当他将文件重新命名为“configfile.txt”并将其复制过来时,一切又恢复正常了。
Did the filename change in any way?
We had one case where someone copied a newer revision edited outside the working directory to the working directory. TortiseSVN marked the file has changed, but couldn't diff it. Turns out the original working copy was named "configfile.txt" and he renamed his "ConfigFile.txt" to make it more readable. When he named his file back to "configfile.txt" and copied that over, everything worked again.