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

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

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

Am 18 Jul 2006 um 13:01 hat Tobias Schäfer geschrieben:

> I cannot confirm the bug with 1.4.0-dev, rev. 7012. I'm using a German
> WindowsXP, Prof, SP2. You might want to try a nightly 1.4.0-dev build
> but take care: the working copy format will be silently updated to a
> new format and cannot be read by a 1.3.x client.
>
> I saved the two files in an empty directory, opened TMerge and applied
> the diff to the empty directory. The time stamp of the .po file
> changed but was binary identical to the original file. Does it also
> work for you if you place the files outside of your working copy and
> apply the patch there? If not, where can I checkout the directory
> containing the po file?

I tried it again with the file freshly exported from the archive in a
new empty directory => the same error like before.

The archive is 'cvs.gnupg.org/gnupg/trunk/po/zh_CN.po'.
Originally it was the diff from revision 4172 to 4171, but as i wrote
before, even the nearly empty diff-file

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

deletes most of the file Please have a look at the attached strongly
condensed screenshot.

Dirk

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: Screenshot.jpg
     Datum/Date: 18 Jul 2006, 19:49
     Größe/Size: 24406 bytes.
     Typ/Type: JPEG-image

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

Screenshot.jpg
Received on Tue Jul 18 20:06:30 2006

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