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 245218 - Merge Conflicts Resolver should display Branch assignment
Summary: Merge Conflicts Resolver should display Branch assignment
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: 8.0
Hardware: PC All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-06-24 12:38 UTC by ulfzibis
Modified: 2014-08-03 09:53 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 ulfzibis 2014-06-24 12:38:53 UTC
[ JDK VERSION : 1.7.0_45 ]

STEPS:
   * Invoke Resolve Conflicts
   * Click on button "Click me"

ACTUAL:
   Only ordinal revision numbers of concurring files are displayed.

EXPECTED:
   Additionally the Branch assignment should be displayed.
Comment 1 Ondrej Vrabec 2014-06-25 12:36:32 UTC
makes sense, for git too...

fix: core-main #950f14556e98
Comment 2 Quality Engineering 2014-06-27 02:28:31 UTC
Integrated into 'main-silver', will be available in build *201406270001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/950f14556e98
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #245218 - Merge Conflicts Resolver should display Branch assignment
Comment 3 ulfzibis 2014-07-01 16:55:48 UTC
Will this fix be available as patch for 8.0 ?
Comment 4 Ondrej Vrabec 2014-07-01 16:59:41 UTC
(In reply to ulfzibis from comment #3)
> Will this fix be available as patch for 8.0 ?
I doubt it. I can mark it as candidate though in case there is a patch coming.
Comment 5 ulfzibis 2014-07-01 18:45:20 UTC
(In reply to Ondrej Vrabec from comment #4)
> I can mark it as candidate though in case there is a patch coming.

Much thanks :-)
Comment 6 ulfzibis 2014-08-03 09:53:02 UTC
Really great!