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

[TSVN] Re: TMerge: Unknown Line Type problem

From: Norbert Unterberg <nepo_at_gmx.net>
Date: 2005-03-04 09:32:23 CET

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

    + *.bak

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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.