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

"compare with working copy" shows error "... Unknown Line Type ..." on unicode file

From: Roee oz <roee_at_secureislands.com>
Date: Thu, 12 Jun 2008 15:14:56 +0300

Hello Subversion Users.

 

I'm having a problem trying to use "compare with working copy" from the log
view.

The problem occurs when there is a diff in a Unicode file (namely a .cs
class which has Hebrew strings and so is saved as Unicode by visual studio).

If the diff doesn't include this file, it shows OK.

Coming to diff to a version where this file was changed, results in "Unknown
line type was found in line 29 !"

 

I've created the diff via svn directly, and looked at it on notepad, you can
see it's probably a utf-16 file.

I've added the offensive part of the diff as it's seen in notepad, and also
attached the result of the svn diff.

 

Note - comparing between revisions or comparing working copy with base
causes no problems.

 

Thanks a lot,

 

Roee Oz

 

Index: Excel/ExcelLibrary/AddIn/ExcelAddInHelper.cs

===================================================================

--- Excel/ExcelLibrary/AddIn/ExcelAddInHelper.cs (revision
3367)

+++ Excel/ExcelLibrary/AddIn/ExcelAddInHelper.cs (working copy)

@@ -202,7 +202,7 @@

  

                                              {

  

- D o c u m e n t
E x c e l M S d o c = n e w D o c u m e n t E x c e l M S ( w o r k
b o o k ) ;

+ D o c u m e n t
O f f i c e M S d o c = n e w D o c u m e n t E x c e l M S ( w o r
k b o o k ) ;

  

                                                             i f ( ! I s U
s e r D o c ( d o c ) )

  

@@ -214,7 +214,7 @@

  

                                                             L o g A d d I n
. L o g g e r . T r a c e ( " w o r k b o o k : [ " + d o c . F u l l
N a m e + " ] o p e n e d " ) ;

  

- O n D o c u m e
n t O p e n ( d o c ) ;

+ O n D o c u m e
n t O p e n ( r e f d o c ) ;

  

                                              }

  

@@ -244,16 +244,12 @@

  

                                                             m _ A u t o C r
e a t e d W i n d o w s . C l e a r ( ) ;

  

- u s i n g ( D
o c u m e n t E x c e l M S d o c E x c e l = n e w D o c u m e n t
E x c e l M S ( w o r k b o o k ) )

+ D o c u m e n t
O f f i c e M S d o c E x c e l = n e w D o c u m e n t E x c e l M
S ( w o r k b o o k ) ;

  

- {

+ L o g A d d I n
. L o g g e r . T r a c e ( " w o r k b o o k c l o s i n g : [ " +
d o c E x c e l . F u l l N a m e + " ] " ) ;

  

-
L o g A d d I n . L o g g e r . T r a c e ( " w o r k b o o k c l o s i n
g : [ " + d o c E x c e l . F u l l N a m e + " ] " ) ;

+ b a s e . O n D
o c u m e n t B e f o r e C l o s e ( r e f d o c E x c e l , r e f c
a n c e l ) ;

  

-
b a s e . O n D o c u m e n t B e f o r e C l o s e ( d o c E x c e l , r
e f c a n c e l ) ;

-

- }

-

                                              }

  

                                              c a t c h ( E x c e p t i o
n e )

@@ -280,11 +276,11 @@

  

                                              {

  

- D o c u m e n t
E x c e l M S d o c E x c e l = n e w D o c u m e n t E x c e l M S
( w o r k b o o k ) ;

+ D o c u m e n t
O f f i c e M S d o c E x c e l = n e w D o c u m e n t E x c e l M
S ( w o r k b o o k ) ;

  

                                                             L o g A d d I n
. L o g g e r . T r a c e ( " B e f o r e S a v e , w o r k b o o k :
[ " + d o c E x c e l . F u l l N a m e + " ] " ) ;

  

- b a s e . O n D
o c u m e n t B e f o r e S a v e ( d o c E x c e l , s a v e A s U I ,
r e f c a n c e l ) ;

+ b a s e . O n D
o c u m e n t B e f o r e S a v e ( r e f d o c E x c e l , s a v e A
s U I , r e f c a n c e l ) ;

  

                                              }

  

@@ -450,7 +446,7 @@

  

                                              {

  

- D o c u m e n t
E x c e l M S d o c E x c e l = ( D o c u m e n t E x c e l M S ) m _
a p p . G e t A c t i v e D o c u m e n t ( ) ;

+ D o c u m e n t
O f f i c e M S d o c E x c e l = ( D o c u m e n t E x c e l M S ) m
_ a p p . G e t A c t i v e D o c u m e n t ( ) ;

  

                                                             i f ( U s e r
3 2 . W A _ A C T I V E ! = c w p . w P a r a m . T o I n t 3 2 ( ) |
| d o c E x c e l . G e t W i n d o w ( ) . H a n d l e . T o S t r i n g
( ) ! = c w p . h w n d . T o S t r i n g ( ) )

  

@@ -474,7 +470,7 @@

  

 
i t e m . S e c o n d V a l u e = t r u e ;

  

-
b a s e . S e n d E d i t E v e n t ( d o c E x c e l , t r u e , E v e
n t T y p e . O p e n ) ;

+
b a s e . S e n d E d i t E v e n t ( r e f d o c E x c e l , t r u e ,
E v e n t T y p e . O p e n ) ;

  

 
r e t u r n ;

 

Yours,

Roee Oz

Director of Research and Development

Secure Islands Technologies Ltd.

High-Tech Village, Givat Ram Campus The Hebrew University,

P.O.Box 39158, Jerusalem 91391, Israel.

Mobile: +972-52-8225983

Tel: +972-2-6522941

Fax: +972-2-5661881

 <http://www.secureislands.com/> www.secureislands.com

 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org

Received on 2008-06-12 14:21:37 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.