Bug 704391

Summary:	meld <file> doesn't work with Mercurial work (sub)directories
Product:	[Fedora] Fedora	Reporter:	Ling Li <liling>
Component:	meld	Assignee:	Dominic Hopf <dmaphy>
Status:	CLOSED NEXTRELEASE	QA Contact:	Fedora Extras Quality Assurance <extras-qa>
Severity:	medium	Docs Contact:
Priority:	unspecified
Version:	rawhide	CC:	any0n3, cwickert, dmaphy
Target Milestone:	---
Target Release:	---
Hardware:	All
OS:	Linux
Whiteboard:
Fixed In Version:		Doc Type:	Bug Fix
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2012-03-06 14:13:02 UTC	Type:	---
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:

Description Ling Li 2011-05-13 00:57:47 UTC

Description of problem:

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 same level as the special .hg directory.

Version-Release number of selected component (if applicable):

I've tried meld 1.3 to 1.5.1 (rawhide).

How reproducible:

Always.

Steps to Reproduce:
1. Create a Mercurial repository (hg init w)
2. Add a file and modify it (mkdir w/d; cd w/d; echo empty > f; hg add f; hg ci -m test; echo more >> f)
3. Launch meld with <file> (meld f)
  
Actual results:

meld GUI with one panel, no diff.

Expected results:

meld GUI with two panels, with diff.

Comment 1 Ling Li 2011-05-13 00:59:43 UTC

Note that meld <dir> knows where .hg is (even if it is not at the current work directory), and properly show the version control comparison for directories.  The bug only happens to meld <file>.

Comment 2 Ling Li 2011-05-29 14:15:51 UTC

This has been fixed in the upstream (https://bugzilla.gnome.org/show_bug.cgi?id=650074).  A one-line change.  Guess the next release could incorporate the fix.

Comment 3 Michael Spahn 2012-03-06 14:13:02 UTC

Thanks for your assistance! :-)