[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

esvn diff problem with C++ template code

From: Relson, David <david.relson_at_orion-sys.com>
Date: Wed, 21 Apr 2010 10:45:42 -0400



I've encountered a glitch in esvn 0.6.12's diff program. C++ template
code is incorrectly displayed.


The attached screenshot esvn_FileManager_h.png shows 3 windows:


1) emacs window with file FileManager.h displayed. Notice the use of
templates in the following lines:


      vector<string> files;

      vector<string> master;

      vector<string>::iterator iter;


2) eSVN window showing history for FileManager.h. Current revision is
779, previous revision is 698. The major change was to the template
definitions. The old file has the following lines:


      vector<struct dirent *> files;

      vector<struct dirent *> master;

      vector<struct dirent *>::iterator iter;


3) diff of 698, 799 is lacking the text in <...>, i.e. should have:


- vector<struct dirent *> files;

- vector<struct dirent *> master;

- vector<struct dirent *>::iterator iter;

+ vector<string> files;

+ vector<string> master;

+ vector<string>::iterator iter;



For comparison, a screen shot of TortoisSVN's diff is also attached.
TortoiseSVN's output is correct.






Received on 2010-04-21 17:18:50 CEST

This is an archived mail posted to the Subversion Dev mailing list.