After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 638314 - Meld computes differences indefinitely
Meld computes differences indefinitely
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: filediff
git master
Other Linux
: Normal normal
: ---
Assigned To: Kai Willadsen
meld-maint
: 640168 645038 (view as bug list)
Depends on:
Blocks:
 
 
Reported: 2010-12-30 00:12 UTC by Vadim Peretokin
Modified: 2011-05-22 20:29 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
file1 (33.52 KB, text/xml)
2010-12-30 00:12 UTC, Vadim Peretokin 		  Details
file2 (28.50 KB, text/xml)
2010-12-30 00:13 UTC, Vadim Peretokin 		  Details
Patch (1.14 KB, patch)
2011-01-04 09:18 UTC, Kai Willadsen 		none Details | Review

Description Vadim Peretokin 2010-12-30 00:12:09 UTC 
Created attachment 177227 [details]
file1

When comparing the two attached files, meld never stops comparing. I did disable all text filters.

This is using the latest git.
Comment 1 Vadim Peretokin 2010-12-30 00:13:38 UTC 
Created attachment 177228 [details]
file2
Comment 2 Kai Willadsen 2010-12-30 02:53:55 UTC 
Tested with the attached files, and for me the comparison completes straight away (i.e, less than one second). This is also with the latest git, all filters disabled. Can you provide some more information about your setup?
Comment 3 Vadim Peretokin 2010-12-30 11:46:51 UTC 
Ubuntu 10.10 64bit, Python 2.6.6. Here's a video of the issue: http://ge.tt/3vJShQn
Comment 4 Kai Willadsen 2010-12-30 21:18:50 UTC 
Okay, so it hangs after loading the files at "Computing differences", and there's no terminal output/backtrace/whatever. Thanks.

Can you test with an older release of Meld (1.4.0 would be fine)? Unfortunately, there isn't really much for me to work with at the moment. If it's a new problem, git bisect-ing would help enormously.
Comment 5 Vadim Peretokin 2010-12-30 22:48:54 UTC 
Perhaps the issue is the one file has a WIN encoding, while another uses UNIX ones.
Comment 6 Vadim Peretokin 2010-12-30 22:49:08 UTC 
Oh and it worked in 1.3.2, sorry.
Comment 7 Kai Willadsen 2010-12-30 23:04:45 UTC 
When you say windows encoding, do you mean that one file uses windows line endings? That should actually work *better* with Meld git, not worse, so if there's a regression in that code, I'd love to figure it out.

Is there any chance you could use git bisect to isolate the commit to blame?
Comment 8 Vadim Peretokin 2010-12-31 20:14:53 UTC 
Yes, sorry - did mean the line endings.

Not familiar with git that well enough, and don't have time to figure that out at the moment, I apologize.
Comment 9 Kai Willadsen 2011-01-04 09:18:25 UTC 
Created attachment 177465 [details] [review]
Patch

I'm hoping that the attached patch should fix the issue, but I'd like some testing of it. Please let me know how you go.
Comment 10 Kai Willadsen 2011-01-07 21:34:00 UTC 
I've pushed the above patch to head, so I'm closing the bug. Please reopen if you continue to see this problem.
Comment 11 Gamesh 2011-01-21 18:25:14 UTC 
*** Bug 640168 has been marked as a duplicate of this bug. ***
Comment 12 Kai Willadsen 2011-03-17 23:11:15 UTC 
*** Bug 645038 has been marked as a duplicate of this bug. ***
Comment 13 Kai Willadsen 2011-05-22 20:29:47 UTC 
*** Bug 650726 has been marked as a duplicate of this bug. ***