Bug 704391 - meld <file> doesn't work with Mercurial work (sub)directories
Summary: meld <file> doesn't work with Mercurial work (sub)directories
Keywords:
Status: CLOSED NEXTRELEASE
Alias: None
Product: Fedora
Classification: Fedora
Component: meld
Version: rawhide
Hardware: All
OS: Linux
unspecified
medium
Target Milestone: ---
Assignee: Dominic Hopf
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2011-05-13 00:57 UTC by Ling Li
Modified: 2012-03-06 14:13 UTC (History)
3 users (show)

Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Clone Of:
Environment:
Last Closed: 2012-03-06 14:13:02 UTC
Type: ---
Embargoed:


Attachments (Terms of Use)

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! :-)


Note You need to log in before you can comment on or make changes to this bug.