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

Bug? TortoiseMerge diff shows only one of two appended lines

From: Andy Hume <andyhume32_at_yahoo.co.uk>
Date: 2007-05-19 10:58:12 CEST


On both and I see what appears to be a bug with the TortoiseMerge diff. The last change to a particular file in the repository ("strings.txt"), was the appending of two new lines. However when I do >Show log< and double click the file (/select >Show differences<) in the bottom panel, the TortoiseMerge display shows only one line appended! However if I do >Show differences as unified diff< then the two appended lines are there.

The up-to-date content of the file (on my disk) is:
ERR31036=Error saving to file.
ERR31037=Error loading from file.
WinForms_RecursiveFormCreate=There is a[...]
WinForms_SeeInnerException=An error[...]

And the unified diff is:
Index: strings.txt
--- strings.txt (revision 76786)
+++ strings.txt (revision 76787)
@@ -117,4 +117,6 @@
 ERR31027=Unable to activate object.
 ERR31032=Unable to create embedded object.
 ERR31036=Error saving to file.
-ERR31037=Error loading from file.
\ No newline at end of file
+ERR31037=Error loading from file.
+WinForms_RecursiveFormCreate=There is a reference to a default instance from the constructor of a form, which leads to infinite recursion. Please refer to the form itself using 'Me' from within the constructor.
+WinForms_SeeInnerException=An error occured while creating the form. See Exception.InnerException for details. The error is: {0}
\ No newline at end of file

But as I noted TortoiseMerge shows only the "WinForms_RecursiveFormCreate" line being added... A screenshot is attached. (The two lines haven't been concatenated into one BTW).

This is a file from the Mono project so this can be tested remotely. The file is svn://anonsvn.mono-project.com/source/trunk/mono-basic/vbruntime/Microsoft.VisualBasic/strings.txt. I've also downloaded the file's two revisions and manually running TortoiseMerge on them shows the same problem (not unexpectedly). I've attached them as they are small, diff with e.g. TortoiseMerge.exe /base:strings-64004.txt /mine:strings-76787.txt

Hopefully I'm not just seeing things!

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

Received on Sat May 19 11:02:39 2007

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

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