subversion:如何:修改后的工作副本和备用分支之间的区别?
我已经尝试过了。
我的工作副本基于
svn://foo.net/svn/repo/branch/yyy
I想要与分支 xxx 进行比较的修改版本。我已经尝试过
svn diff --old=svn://foo.net/svn/repo/branch/xxx --new=.
,但这似乎只是简写
svn diff --old=svn://foo.net/svn/repo/branch/xxx --new=svn://foo.net/svn/repo/branch/yyy
I have tried.
My working copy is based on but a modified version of
svn://foo.net/svn/repo/branch/yyy
I want to diff against branch xxx. I have tried
svn diff --old=svn://foo.net/svn/repo/branch/xxx --new=.
but that only seems like shorthand for
svn diff --old=svn://foo.net/svn/repo/branch/xxx --new=svn://foo.net/svn/repo/branch/yyy
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
似乎 subversion 不允许将工作副本与 url 进行比较。 --old 和 --new 都必须是 WC 或 URL。
我认为有一个解决方法 - 您可以检查您的
xxx
分支,然后比较 2 个工作副本。svn diff xxx_branch yyy_modified_wc编辑 正如 Pavel 注意到的
svn diff
这种形式不比较 xxx 和 yyy - 它只显示 xxx 和 的本地修改yyy。svn diff --old=xxx --new=yyy
似乎不允许(至少在 svn 客户端 1.6.17 中)。要比较 xxx 和 yyy,需要diff
命令。 Pavel,10x 通知Seems that subversion doesn't allow to compare working copy with url. Both --old and --new need to be either WC or URL.
I think there's a workaround though - you may checkout your
xxx
branch and then compare 2 working copies.svn diff xxx_branch yyy_modified_wcEdit As Pavel noticed
svn diff
in this form doesn't compare xxx and yyy - it just shows local modifications of xxx and yyy.svn diff --old=xxx --new=yyy
seems not allowed (at least in svn client 1.6.17). To compare xxx and yyydiff
command is needed. Pavel, 10x for the notice您还可以比较两个网址:速度更快,因为您不必签出另一个分支。
You can also compare between two urls : it's faster because you don't have to checkout the other branch.