[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: Tobias Schäfer <tobiasschaefer_at_gmx.de>
Date: 2006-07-18 13:01:29 CEST

On Tuesday 18 July 2006 10:20, Dirk Traulsen wrote:
> 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.

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?

Tobias

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 18 13:02:22 2006

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