GNOME Bugzilla – Bug 650074
meld <file> doesn't work with Mercurial (sub)directories
Last modified: 2011-05-29 14:09:52 UTC
(I filed the bug at Fedora's bugzilla, https://bugzilla.redhat.com/show_bug.cgi?id=704391, but then realized it's better to file it here.) meld <file> is supposed to start a version control comparison, and it indeed does so in a (say) Subversion work directory. However, this is broken for Mercurial when <file> is not at the top level (where .hg directory is). Note that meld <dir> knows where .hg is (even if it is not at the current work directory), and can properly show the version control comparison for directories. The bug only happens to meld <file>.
This was actually a bug in another VC plugin, which was incorrectly claiming that it could handle the repository when it couldn't. I've pushed a fix that works for me; please let me know if you still have problems with git HEAD. Thanks for your bug report.
Thanks for looking into this. As far as I can tell, the bug you fixed is a separate issue (which isn't in the 1.5.1 release). I downloaded the master branch, applied your patch (I don't know how to use git; so this is my ugly way to switch to your FossilFix branch), and I saw the same problem. I.e., meld loads a file just as a plain txt file, showing no diffs.
I think I've figured out the difference between my bug and your bug; the one I fixed sounded very similar to your report. Basically, if you have a hg repo, and you're in the top level directory of it, and you have a folder b with a file c in it, and you type 'meld b/c', then it didn't work; with my patch, it does. I've now reproduced what looks to be your different bug where, in my previous example, you're in directory b and you type 'meld c', then it shows a single pane diff as you describe. I haven't figured out what the problem is here yet, so I'm just reopening the bug.
This should now *actually* be fixed in git head. Again, please reopen or comment or something if you still experience the problem.
I applied that patch and it worked for me. Thanks! http://groups.google.com/group/mathjax-users/browse_thread/thread/4c5ec9cc15e83de1