Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3ED139B8E for ; Mon, 3 Oct 2011 09:30:28 +0000 (UTC) Received: (qmail 78345 invoked by uid 500); 3 Oct 2011 09:30:27 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 78310 invoked by uid 500); 3 Oct 2011 09:30:27 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 78302 invoked by uid 99); 3 Oct 2011 09:30:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2011 09:30:27 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [217.173.253.102] (HELO relay02.telecomputing.no) (217.173.253.102) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2011 09:30:16 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EAFeAiU7ZrfjH/2dsb2JhbABCgk2lQYEFgVotQR0BFSdEJgEEG4d1mhueKoZAYQSZJIt8 X-IronPort-AV: E=Sophos;i="4.68,478,1312149600"; d="scan'208,217";a="161817812" Received: from unknown (HELO MES1OS2SXH002.mes1.tconet.net) ([217.173.248.199]) by relay02.telecomputing.no with ESMTP/TLS/AES128-SHA; 03 Oct 2011 11:29:45 +0200 Received: from MES1OS2SXC003.mes1.tconet.net ([217.173.248.223]) by MES1OS2SXH002.mes1.tconet.net ([217.173.248.199]) with mapi; Mon, 3 Oct 2011 11:29:45 +0200 From: "Albertsen, Ketil" To: "users@subversion.apache.org" Date: Mon, 3 Oct 2011 11:29:44 +0200 Subject: Renamed/moved files diffing Thread-Topic: Renamed/moved files diffing Thread-Index: AcyBrvv96hFWpFWJRy6xixeH/AoHhQ== Message-ID: <5B4B9A479BF6994B88EA975675EC5B79058790BC60@MES1OS2SXC003.mes1.tconet.net> Accept-Language: nb-NO, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: nb-NO, en-US Content-Type: multipart/alternative; boundary="_000_5B4B9A479BF6994B88EA975675EC5B79058790BC60MES1OS2SXC003_" MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org --_000_5B4B9A479BF6994B88EA975675EC5B79058790BC60MES1OS2SXC003_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable We are using the CodeCollaborator system from SmartBear for code reviews. T= his system uses the command: svn -r "firstversion:lastversion" svnpath to generate a diff list used indicate which lines were modified for the cod= e revision in question. Problem is with files that have been moved/renamed in the repository: The f= ile under the old name is reported as deleted, under the new name as all ne= w lines. CodeCollaborator cannot report which lines are changed/unchanged. It turns out that this is due to SVN, which In fact creates a diff file rep= orting exactly what CodeCollaborator displays. Except that there is a (cumb= ersome!) workaround: If the diff command explicitly names one single file d= own to the last character of the file extension, then SVN will generate a = proper diff file. When you move a large tree, the number of files that must= be handled one by one is large, and the manual work is significant. The re= viewer will see the files as completely spearate resources, not as an eleme= nt in a directory structure. Does anyone know of a way to force svn diff to create a proper diff for mov= ed files even when diffing an entire directory, similar to what it does whe= n diffing a single file? Or, as an alternative: Make CodeCollaborator automatically do the diffing i= n a file by file manner and present them in a directory structure (Obviously, I could ask th latter question in a CodeCollaborator forum, but= I assume that SVN + CodeCollaborator users who read mailing lists are here= as well... And the real problem is with SVN, not CodeCollaborator!) According to our IT systems guy, our SVN server runs version 1.6.6, r40053. --_000_5B4B9A479BF6994B88EA975675EC5B79058790BC60MES1OS2SXC003_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

We are using the CodeCollaborator system from SmartBear for code review= s. This system uses the command: svn –r “firstversion:lastversi= on” svnpath

to generate a diff list used indicate which lines were modified for the= code revision in question.

 

Problem is with files that have been moved/renamed in the reposito= ry: The file under the old name is reported as deleted, under the new name = as all new lines. CodeCollaborator cannot report which lines are changed/un= changed.

 

It turns ou= t that this is due to SVN, which In fact creates a diff file reporting exac= tly what CodeCollaborator displays. Except that there is a (cumbersome!) wo= rkaround: If the diff command explicitly names one single file down to the = last character of the file extension, then  SVN will generate a proper= diff file. When you move a large tree, the number of files that must be ha= ndled one by one is large, and the manual work is significant. The reviewer= will see the files as completely spearate resources, not as an element in = a directory structure.

 

Does anyone know of a way to force svn diff to create a proper diff for m= oved files even when diffing an entire directory, similar to what it does w= hen diffing a single file?

 

Or, as an alternative: Make CodeCollaborator automatically do the = diffing in a file by file manner and present them in a directory structure<= o:p>


(Obviously= , I could ask th latter question in a CodeCollaborator forum, but I assume = that SVN + CodeCollaborator users who read mailing lists are here as well&#= 8230; And the real problem is with SVN, not CodeCollaborator!)

 

According to our IT systems guy, = our SVN server runs version 1.6.6, r40053.

= --_000_5B4B9A479BF6994B88EA975675EC5B79058790BC60MES1OS2SXC003_--