[TSVN] Re: TMerge: Unknown Line Type problem

SteveKing schrieb:

>> "An unknown line type was found in line 2053".
> It would help if you could send me that file, or at least tell me the
> lines around the reported one.

Ok, here we go:

"Unknown line type in line 1943"

I can not post the complete diff file to the list (too much source code
that I do not want to get public).

It looks that TMerge has porblems with property changes.
The offending lines are here:

---begin diff file section----
===================================================================

Property changes on: D:/PMC-Drive/pmc-trunk/PMC_V/src
___________________________________________________________________
Name: svn:ignore <---this is line 1943--->
    - *.bak
rtos_cnf.h
*.bin
menue_loc_binary.c
menue_binary.c
pmc_v_tdef.h

    + *.bak
rtos_cnf.h
*.bin
menue_loc_binary.c
menue_binary.c

Index: D:/PMC-Drive/pmc-trunk/PMC_V/PMC_V.TBP
===================================================================
---end diff file section----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Mar 4 09:34:01 2005