svn diff，当文件标记有“按提交计划的历史记录"时， [英] svn diff when files are marked with "history scheduled with commit"

问题描述

我对工作目录中已合并到主干的分支进行了更改. svn stat显示正确的已更改文件列表.但是，"svn stat"输出在计划用于提交到分支的新文件的提交的历史记录中包括"+".

I have changes on a branch that I have merged to trunk in my working directory. Svn stat shows the correct list of changed files. However, the "svn stat" output includes a "+" in the history scheduled for commit on each file added new to the branch.

A + src \ main \ java \ com .... java

A + src\main\java\com....java

当我运行"svn diff"时，补丁输出中将不包含带有"+"的添加文件.

When I run "svn diff", the added files that have the "+" are not included in the patch output.

这似乎坏了.如果一个文件被标记为已添加，那么它的全部内容应该在diff输出中.我尝试通过--notice-ancestry.差异输出没有变化.我发现与该问题最接近的是这些评论关于复制/移动的文件

This seems broken. If a file is marked as added, then it's entire contents should be in the diff output. I tried passing the --notice-ancestry. There was no change to the diff output. The closest I can find to the same problem is these comments regarding copied/moved files

有人知道如何使SVN在diff输出中包括这些文件吗?

Does someone know how to get SVN to includes these files in the diff output?

我刚刚尝试过此

I just tried an external diff program as suggested by this questions answer, but it didn't work for me.

推荐答案

发布1.7版时，出于此目的，svn diff将具有--show-copies-as-adds开关.这很好地表明了1.6版之前的版本不具备此功能.

When version 1.7 is released, svn diff will have a --show-copies-as-adds switch for that purpose. That's a good indication that versions through 1.6 don't have that ability.

这篇关于svn diff，当文件标记有“按提交计划的历史记录"时，的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！