Bug 269270 - Fixing results of wrong automated merge at cnd-main
Fixing results of wrong automated merge at cnd-main
Status: RESOLVED FIXED
Product: cnd
Classification: Unclassified
Component: -- Other --
Dev
All All
: P2 (vote)
: Dev
Assigned To: ilia
issues@cnd
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2016-12-08 11:40 UTC by ilia
Modified: 2017-02-10 13:34 UTC (History)
0 users

See Also:
Issue Type: DEFECT
:


Attachments

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.


By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo