使用 psvn 显示修订版本差异
有没有办法在 psvn 中区分两个任意修订版?我希望能够在 svn-status 窗口中获取文件的 diff/ediff。
我只发现 svn-file-show-svn-diff 显示工作副本和 HEAD 之间的差异
Is there a way to diff two arbitrary revisions in psvn? I'd like to have possibility to get diff/ediff for a file in the svn-status window.
I only found svn-file-show-svn-diff which shows diff between a working copy and HEAD
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
Cx v l
然后选择您想要比较的 2 个版本并点击d
C-x v l
then select the 2 versions you want to diff and hitd
对于差异,请在 = (Mx svn-file-show-svn-diff) 之前按 Cu,它将以交互方式提示您进行修订。此时以 arb1:arb2 形式输入您想要比较的修订版本。然后 svn-diff 缓冲区将以 diff 统一形式显示 arb1 和 arb2 修订版之间的更改。
对于 ediff,
不幸的是上面的方法不起作用,我相信当前的 svn-file-show-svn-ediff 函数不可能,看来你需要在 svn-log 缓冲区中并在文件路径行上使其工作。首先通过在 svn-status 缓冲区中的所需文件上按 l 进入 svn-log 缓冲区。然后,按 Cu,然后按 E (Mx svn-log-ediff-specific-revision)。然后以 arb1:arb2 形式指定您的 arb1 和 arb2 修订版。编辑:从修订版 40434 (2009-11-09) 添加了 svn-log-ediff-specific-revision。
For a diff, press C-u before = (M-x svn-file-show-svn-diff), and it will interactively prompt you for a revision. At this point put in the revisions you like to compare in arb1:arb2 form. Then the svn-diff buffer will show the changes between arb1 and arb2 revisions in diff unified form.
For an ediff,
the above unfortunately does not work and I believe it is not possible with the current svn-file-show-svn-ediff function, it seems you need to be in the svn-log buffer and on a file path line to make it work. First get into the svn-log buffer by pressing l on the desired file in the svn-status buffer. Then, press C-u then E (M-x svn-log-ediff-specific-revision). Then specify your arb1 and arb2 revisions in arb1:arb2 form.Edit: added svn-log-ediff-specific-revision, from revision 40434 (2009-11-09).