First of all - even after some time using TSVN I still find wonderful
details solutions!
I know that recently there was a bug report concerning TSVN Merge hanging
on files with the only difference being a blank at the end of a line.
Now I experienced the same symptoms (I am using build 1.0.6.1200 on Win2K)
but the lines do not differ at the _end_ of the line but in the middle.
Just want to be sure that this bug has also been addressed by the fix.
Producing unified diff works find (see below)
Index: modbus.h
===================================================================
--- modbus.h (revision 362)
+++ modbus.h (revision 442)
@@ -19,8 +19,8 @@
int Nin; /**< Zahl der neuen Bytes in
Eingabe-Puffer */
int Nout; /**< Zahl der aktiven Bytes in
Ausgabe-Puffer */
unsigned size; /**< Aktive Puffergrösse für neue Zeichen
*/
- unsigned char _in[_MODBUS_BUF_SIZE]; /**< Puffer mit den gelesenen
Zeichen.*/
- unsigned char out[_MODBUS_BUF_SIZE]; /**< Puffer mit den zu
schreibenden Zeichen. */
+ unsigned char _in[_MODBUS_BUF_SIZE]; /**< Puffer mit den
gelesenen Zeichen.*/
+ unsigned char out[_MODBUS_BUF_SIZE]; /**< Puffer mit den zu
schreibenden Zeichen. */
unsigned char *in; /**< Zeiger auf die aktuelle Position.
Eingabe-Zeichenkette, sowohl zum Datenablegen wie zum Lesen. */
} Modbus;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jul 3 11:33:28 2004