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

TortoiseMerge bug: Deletes and changes lots of lines not in the diff

From: Dirk Traulsen <dirk.traulsen_at_lypso.de>
Date: 2006-07-18 10:20:19 CEST

Hi!

I use TortoiseSVN 1.3.5 and a german WindowsXP Home SP2.

When I was merging quite a few diffs, I found later that big parts
of my files were missing. As I found, it was not the fault of the
diffs, but a bug in TortoiseMerge. It changed a few lines and deleted
a lot of lines and in some cases most of the file.

I attached a shorter version of one file and the shortest(!)
necessary version of the diff-file to reproduce the error:

Index: zh_CN.po
===================================================================
--- zh_CN.po (Revision 4171)
+++ zh_CN.po (Revision 4172)

That's it. So basically it seems that something in the file is a
problem for TortoiseMerge.

Dirk

PS.: I'm not subscribed to this list, but will follow the thread on
Gmane or haxx.

Der folgende Teil dieser Nachricht enthält einen Anhang im
sogenannten Internet MIME Nachrichtenformat.
Wenn Sie Pegasus Mail oder ein beliebiges anderes MIME-kompatibles
Email-System verwenden, sollte Sie den Anhang mit Ihrem Email-System
speichern oder anzeigen können. Anderenfalls fragen Sie Ihren Administrator.

The following section of this message contains a file attachment
prepared for transmission using the Internet MIME message format.
If you are using Pegasus Mail, or any another MIME-compliant system,
you should be able to save it or view it from within your mailer.
If you cannot, please ask your system administrator for assistance.

   ---- Datei Information/File information -----------
     Datei/File: zh_CN.po.diff
     Datum/Date: 18 Jul 2006, 9:46
     Größe/Size: 146 bytes.
     Typ/Type: Unbekannt

Der folgende Teil dieser Nachricht enthält einen Anhang im
sogenannten Internet MIME Nachrichtenformat.
Wenn Sie Pegasus Mail oder ein beliebiges anderes MIME-kompatibles
Email-System verwenden, sollte Sie den Anhang mit Ihrem Email-System
speichern oder anzeigen können. Anderenfalls fragen Sie Ihren Administrator.

The following section of this message contains a file attachment
prepared for transmission using the Internet MIME message format.
If you are using Pegasus Mail, or any another MIME-compliant system,
you should be able to save it or view it from within your mailer.
If you cannot, please ask your system administrator for assistance.

   ---- Datei Information/File information -----------
     Datei/File: zh_CN.po
     Datum/Date: 18 Jul 2006, 8:20
     Größe/Size: 8105 bytes.
     Typ/Type: Unbekannt

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

  • Application/Octet-stream attachment: zh_CN.po
Received on Tue Jul 18 12:32:46 2006

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