This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 175415 - Mercurial history diff blindly compares unrelated changesets
Summary: Mercurial history diff blindly compares unrelated changesets
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: 6.x
Hardware: All All
: P1 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-10-26 12:01 UTC by gborkowski
Modified: 2009-10-28 11:50 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description gborkowski 2009-10-26 12:01:36 UTC
Version 6.7 and 6.7.1.
On project node, I select Mercurial-> search history, to the search, see list of changesets, switch to Diff view, select
some changeset, select some file from changeset list, and I see the diff between selected version (say N) and... version
N-1, which is in completely unrelated branch! This means that Netbeans blindly takes N-1 revision for doing diffs,
instead of taking parent revision. 
This makes History in Mercurial under Netbeans completely unusable - what's the point of comparing two completely
unrelated changesets?
What's even worse, even if I know what is proper parent revision (because I can check it on myself) I don't see any way
of comparing them in Netbeans. When I select such two revisions (with Ctrl key) on changesets list on history view,
netbeans says "illegal selection".
I'm setting P1 for this, because in this shape the search history functionality in netbeans is completely unusable. On
the other hand, I love visual diffs in netbeans - they are very easy to read and navigate, I loved this functionality on
Subversion, but it was very slow (because of SVN nature). Now, after migrating to Hg, in order (among others) to get
faster responses in history browsing, suddenly I discover that it doesn't work at all, because of comparing unrelated
branches...
Comment 1 Ondrej Vrabec 2009-10-26 15:49:52 UTC
fixed: cdev #ac4ed1b2fd29
Comment 2 Ondrej Vrabec 2009-10-26 15:51:34 UTC
fixed: cdev #ac4ed1b2fd29
Comment 3 gborkowski 2009-10-26 15:54:52 UTC
Thanks for quick fix
Is it going to be available in updates to 6.7.1? From what I see 6.8 is still in beta now, so it's too risky to switch
to it at this moment.
Comment 4 Ondrej Vrabec 2009-10-26 16:07:44 UTC
I am afraid the fix won't be available for 6.7.1. However i may send you a patched nbm just with this fix and you can
install it to 6.7.1 manually. Just send me an email, i will reply and add the nbm as attachment.
Comment 5 Quality Engineering 2009-10-28 11:50:00 UTC
Integrated into 'main-golden', will be available in build *200910280201* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/ac4ed1b2fd29
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #175415 - Mercurial history diff blindly compares unrelated changesets
previous revision is acquired via hg parents command before 'diffing to previous'