TortoiseSVN 是否留下任何合并日志?

发布于 12-04 21:03 字数 44 浏览 1 评论 0原文

当我与 TSVN 合并时,是否有一个文本文件可以让我看到哪些文件存在冲突?

When I merge with TSVN, is there a text file where I can see in which files there were conflicts?

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(2

鸠书2024-12-11 21:03:04

如果您进行了合并,您就已经解决了冲突。此外,TortoiseSVN 和 SVN 都会记录冲突的文件。所以答案是否定的。没有生成文件。如果您没有解决冲突,您可以通过 TortoiseSVN“检查修改”或在命令行上通过

svn status

前缀为“C”的行来查看冲突的文件

If you did the merge you already solved the conflicts. Furthermore TortoiseSVN nor SVN do record the files which where in conflict. So the answer is no. There is no file generated. If you didn't solved the conflicts you can see the files which are in conflict via TortoiseSVN "Check for Modification" or on command line via

svn status

The lines which are prefixed by a "C"

耳钉梦2024-12-11 21:03:04

如果更新操作后出现冲突,那么您会在日志窗口中看到红线:

Conflicted: path/file

然后,如果您转到路径,您将看到文件。[rev1]< /strong> 和 file.[rev2]:来自存储库的文件的最新版本、上次成功更新后的文件版本,当然还有文件的工作版本 - <强>file.mine。因此,您可以手动解决冲突或使用选项激活 TSVN 菜单(右键单击该行):

Edit conflicts               -> goes to two-side editor
Resolve conflicts using "theirs" -> drop own changes -> Attention! (changes will be lost)
Resolve conflicts using "mine"   -> drop others changes  (others' changes can be restored)
...

在任何情况下,都可以从 TSVN 主菜单 -> 激活此菜单。 已解决...

If you have conflicts after Update operation, then you see red lines in log window:

Conflicted: path/file

Then, you if you go to path will see file.[rev1] and file.[rev2]: the latest version of the file from repo, the version of the file after the last successful update, and of course you have your working version of the file - file.mine. So, you can resolve conflicts manually or activate a TSVN menu with options (right click on line):

Edit conflicts               -> goes to two-side editor
Resolve conflicts using "theirs" -> drop own changes -> Attention! (changes will be lost)
Resolve conflicts using "mine"   -> drop others changes  (others' changes can be restored)
...

In any case, this menu can be activated from the main TSVN menu -> Resolved....

~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文