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 269270 - Fixing results of wrong automated merge at cnd-main
Summary: Fixing results of wrong automated merge at cnd-main
Status: RESOLVED FIXED
Alias: None
Product: cnd
Classification: Unclassified
Component: -- Other -- (show other bugs)
Version: Dev
Hardware: All All
: P2 normal (vote)
Assignee: ilia
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-08 11:40 UTC by ilia
Modified: 2017-02-10 13:34 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description ilia 2016-12-08 11:40:26 UTC 
There is a changeset in cnd-main~default:

changeset:   300689:182d7f074d49
user:        Alexander Simon <alexvsimon@netbeans.org>
date:        Tue Sep 20 14:15:04 2016 +0300
files:       cnd.repository/src/org/netbeans/modules/cnd/repository/storage/Storage.java
description:
Fix wrong automated merge with main-silver:
http://hg.netbeans.org/cnd-main/rev/a35c9aebe422
which undo changeset:
http://hg.netbeans.org/cnd-main/rev/88b687502824


It fixes a result of incorrect merge with main-silver (or developer's mistake, whatever). This changeset should also be transplanted to releases.