Re: Ability to display move of files

25 views
Skip to first unread message

Christian Hammond

unread,
Oct 15, 2012, 5:53:46 AM10/15/12
to reviewb...@googlegroups.com
Can you tell me what revision control system you're using, and how you're generating diffs? We've introduced basic support for this in 1.7, but it depends on the information in the diffs, which depends on the tool.

Christian

--
Christian Hammond - chi...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com


On Mon, Oct 15, 2012 at 2:46 AM, Michael Zhilin <miz...@gmail.com> wrote:
Hi,

Recently I've noticed that if developer moved file from one folder to another, review request will display 2 file - one with deleted content, another with new content. I'm using RB 1.7dev2. Is it possible to merge 2 changes (delete/new) in one? I.e. I would like to have review request with 1 file change.

Best regards,
 Michael

Michael Zhilin

unread,
Oct 15, 2012, 6:01:35 AM10/15/12
to reviewb...@googlegroups.com, chi...@chipx86.com
Hi Christian,

Thank you for quick reply. Revision control system is SVN. Command to generate diff is "diff -u ...". What's kind of information should be present in diffs?

Best regards,
Michael

Michael Zhilin

unread,
Oct 15, 2012, 6:10:55 AM10/15/12
to reviewb...@googlegroups.com, chi...@chipx86.com
Christian,

Small update. Diff is generated by "svn diff --diff-cmd=diff -r 1021:1022" where 1022 is revision of fresh commit. 

Best regards,
Michael. 

Christian Hammond

unread,
Oct 15, 2012, 6:14:00 AM10/15/12
to reviewb...@googlegroups.com
Unfortunately, svn does not include any sort of information on when a file moves/is renamed in their diffs. There's no metadata we can rely upon. We'd have to basically add a bunch of smarts to augment the format of the diff to contain that information, but it's not on the immediate to-do list.

Git handles this pretty well. Subversion has a --git option to svn diff that one would hope would really have that information, and it *sort of* does, but it'd require a lot of changes to support, and won't work today.


Christian

--
Christian Hammond - chi...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com


Michael Zhilin

unread,
Oct 15, 2012, 6:29:48 AM10/15/12
to reviewb...@googlegroups.com
Christian,

Could be git-svn solution of my problem? I.e if we use git repository
cloned from SVN to generate review requests, can it solve this problem
of information lack in diff files?

Thank you,
Michael
Reply all
Reply to author
Forward
0 new messages