1
Old File : /vobs/code1/dir1/file1.c@@/main/branch1/4 .
New File : /vobs/code1/dir1/file1.c@@/main/branch1/mybranch/1

$ diff -q /vobs/code1/dir1/file1.c@@/main/branch1/4 /vobs/code1/dir1/file1.c@@/main/branch1/mybranch/1 文件 /vobs/code1/dir1/ file1.c@@/main/branch1/4 和 /vobs/code1/dir1/file1.c@@/main/branch1/mybranch/1 不同

$ post-review --server http://reviewserver.oursite.com --revision-range='/vobs/code1/dir1/file1.c@@/main/branch1/4:/vobs/code1/dir1/file1 .c@@/main/branch1/mybranch/1' 似乎没有任何差异!$

当文件有差异时,为什么我会收到上述消息?

4

2 回答 2

1
Generate unified diffs of all files using option -U of GNU diff command:
    diff -U 100000 file1.c@@/main/4      file1.c@@/main/10          >   uni_diffs
    diff -U 100000 file2.c@@/main/br1/3  file2.c@@/main/branch2/4   >>  uni_diffs
    diff -U 100000 file3.c@@/main/abc/4  file3.c@@/main/30          >>  uni_diffs
    ....

Note 100000 is passed so that complete file can also be viewed on review board.
Assuming file length is less than 1000000.

Post the above unified diff file to review board :
    post-review --diff-filename=uni_diffs ....

迪帕克

于 2013-12-08T22:26:58.077 回答
1

在许多 RBTool 版本中,ClearCaseClient 类中的函数 diff_between_revisions 中存在错误。

postreview.py 中的问题部分如下所示:

    revision_range = revision_range.split(';')

如果使用当前版本的 Review Board 和 RBTools,则有两种处理此问题的方法:

1) 将 postreview.py 代码中的分号改为冒号

2) 在命令行参数中使用分号作为分隔符。

选择首选的解决方案并使用它。;-)

于 2014-01-31T10:15:58.470 回答