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 683783 - Meld shows directory view from VC's top dir with Git, Subversion 1.7
Meld shows directory view from VC's top dir with Git, Subversion 1.7
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: version
1.6.x
Other Linux
: Normal normal
: ---
Assigned To: Kai Willadsen
meld-maint
Depends on:
Blocks:
 
 
Reported: 2012-09-11 08:53 UTC by Balint Reczey
Modified: 2012-09-21 21:50 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Possible patch (833 bytes, patch)
2012-09-18 20:19 UTC, Kai Willadsen 		none Details | Review

Description Balint Reczey 2012-09-11 08:53:59 UTC 
meld data/ in Meld's git repository shows dirdiff view from ".".

The expected behavior would be showing only the data/ subdirectory:

meld DIR1: Initiate  a  recursive diff between DIR1 and the version-controlled copy of DIR1.

The problem has been reported to Debian at:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687111
Comment 1 Kai Willadsen 2012-09-18 20:19:59 UTC 
Created attachment 224667 [details] [review]
Possible patch

The attached patch fixes this bug for me, but it does introduce a slight behaviour change. Specifically, the VC repository root is now *not* the top level of the VC tree when a subdirectory comparison is requested, rather the requested directory is used; this is probably actually the correct behaviour.

I've only tested this patch with Git, though I imagine that subversion will behave similarly. I'd appreciate it if you could test the patch and let me know how it goes.
Comment 2 Balint Reczey 2012-09-19 11:22:21 UTC 
It seems to work fine with Git and Subversion 1.7 as well.
Comment 3 Kai Willadsen 2012-09-21 21:50:52 UTC 
This problem has been fixed in the development version. The fix will be available in the next major software release. Thank you for your bug report.