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 702057 - Fix for conflict state check - as lookup_files may contain more just the path given to it
Fix for conflict state check - as lookup_files may contain more just the path...
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: filediff
unspecified
Other All
: Normal normal
: ---
Assigned To: meld-maint
meld-maint
Depends on:
Blocks:
 
 
Reported: 2013-06-12 03:13 UTC by Louis
Modified: 2013-06-21 22:04 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Fix for conflict state check - as lookup_files may contain more just the path given to it (1.43 KB, patch)
2013-06-12 03:13 UTC, Louis 		none Details | Review

Description Louis 2013-06-12 03:13:28 UTC 
As per discussion:
https://mail.gnome.org/archives/meld-list/2013-June/msg00014.html

It's a horrible hack, but it works.
Comment 1 Louis 2013-06-12 03:13:30 UTC 
Created attachment 246587 [details] [review]
Fix for conflict state check - as lookup_files may contain more just the path given to it
Comment 2 Kai Willadsen 2013-06-14 23:06:22 UTC 
I think this would be a good case for new API that we can hopefully fix the implementation of in the future.

Can we put this hack in _vc.Vc by adding a new API call there, and use it as though we had a sane API? I'm thinking something like a _vc.Vc.get_entry(path) call that just returns a single Entry object or None. Then we hide the bodies in _vc and no one will ever know.
Comment 3 Kai Willadsen 2013-06-21 22:04:50 UTC 
I pushed your patch, and then basically just moved that hacky bit into Vc. This looks to be working now... thanks!