在Subversion中，列出在主干上已更改但在分支上未更改的文件，并且这两个文件都已更改

Question

我需要知道Subversion中继中已更改的文件，特定分支上未更改的文件以及两个文件中都已更改的文件。

目前，我的方法是获取主干和分支中已更改文件的列表，并使用文件差异工具来查看差异。

有没有比这更好的技术了？

Answer 1

当您有权访问unix shell（或uniq，sort和sed工具）时，可以执行以下操作：

# getting the changed file list in trunk
svn diff --summarize /path/to/repos/trunk@branch-rev /path/to/repos/trunk | sed -e 's/......//' > changes-trunk
# the sed part removes the status columns, which might cause uniq to fail identifying equal files

# getting the changed file list of the branch
svn diff --summarize /path/to/repos/trunk@branch-rev /path/to/repos/branch/foobar| sed -e 's/......//' > changes-branch
# display the files which changed on both branches
sort changes-trunk changes-branch | uniq -d > possible-conflicts

# getting the base file list
svn ls -R /path/to/repos/trunk@branch-rev > files-base
# getting the list of files not changed in trunk
sed -e "s# /path/to/repos/trunk@branch-rev/##" changes-trunk | sort - files-base | uniq -u > untouched