[jira] [Commented] (NETBEANS-433) Improve merge discipline
[
https://issues.apache.org/jira/browse/NETBEANS-433?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16384861#comment-16384861
]
Matthias Bläsing commented on NETBEANS-433:
---
Please close this here - it is a discussion topic and so should be on the
mailing list. I just stumbled over this by chance.
> Improve merge discipline
>
>
> Key: NETBEANS-433
> URL: https://issues.apache.org/jira/browse/NETBEANS-433
> Project: NetBeans
> Issue Type: Task
>Reporter: Karl Richter
>Priority: Major
>
> The git repository https://github.com/apache/incubator-netbeans.git contains
> a lot of duplicate commits (e.g.
> {noformat}
> commit 90366d092beb49d563922c8023093d91d6b59db1 (HEAD -> master,
> origin/master, origin/HEAD)
> Merge: ccc9b5f92 4c4bdd60a
> Author: Jaroslav Tulach
> Date: Mon Feb 26 07:59:53 2018 +0100
> Merge pull request #434 from blackleg/ci_badges
>
> Add build badges to README.md
> commit 4c4bdd60adc2a26800621a76220dab7b146d80f4
> Author: Hector Espert
> Date: Sun Jan 21 12:47:26 2018 +0100
> Added build badges to README.md
> {noformat}
> as well as merge commits (the duplicate example even introduces an empty
> separate merge commit for a fast-forward merge).
> The duplicate commits should simply be avoided since they increase the number
> commits which have to be investigated in bisection search of regressions.
> Furthermore they make it harder to go through git log and make the code base
> appear in bad shape.
> The merge commits should be avoided because they disturb the history log and
> hide information what really happened on the merge branch. It's fine to force
> all contributors to rebase their pull request branches on `master`. In this
> way all merges are fast-forward merges and all commit messages contain
> exclusively useful information. You can take
> https://github.com/zfsonlinux/zfs as an example for an excellent code base.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[jira] [Updated] (NETBEANS-440) Suppress "Profiler Agent Warning: JVMTI classLoadHook: class name is null."
[ https://issues.apache.org/jira/browse/NETBEANS-440?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Gili updated NETBEANS-440: -- Component/s: profiler - Base > Suppress "Profiler Agent Warning: JVMTI classLoadHook: class name is null." > --- > > Key: NETBEANS-440 > URL: https://issues.apache.org/jira/browse/NETBEANS-440 > Project: NetBeans > Issue Type: Improvement > Components: profiler - Base > Environment: Product Version: Apache NetBeans IDE Dev (Build > incubator-netbeans-release-222-on-20180226) > Java: 9.0.4; Java HotSpot(TM) 64-Bit Server VM 9.0.4+11 > Runtime: Java(TM) SE Runtime Environment 9.0.4+11 > System: Windows 10 version 10.0 running on amd64; Cp1252; en_CA (nb) > User directory: C:\Users\Gili\AppData\Roaming\NetBeans\dev > Cache directory: C:\Users\Gili\AppData\Local\NetBeans\Cache\dev >Reporter: Gili >Priority: Minor > > When running the profiler, the output is flooded with "Profiler Agent > Warning: JVMTI classLoadHook: class name is null." > Users have no way of knowing that this message is supposedly harmless, and it > is distracting from valuable output. > Expected behavior: suppress this warning message. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[jira] [Updated] (NETBEANS-146) Apache art-work rebranding
[ https://issues.apache.org/jira/browse/NETBEANS-146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] lbruun updated NETBEANS-146: Description: This lists what needs to be done for a complete re-branding of art-work, e.g. if logo changes. It complements NETBEANS-145. The purpose of the list is to document all places where a change will be required, if for example the logo changes. Those marked with (*) were updated in [PR275|https://github.com/apache/incubator-netbeans/pull/275] so that is will be possible to release under the ASF hospice. Consider this as a stop-gap measure. h2. Platform *About Dialog* * There's no specific image for the About Dialog: the splash image is used. *Splash* * [splash.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/splash.gif] (*) * [splash_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/splash_dark.gif] (*) * It may be required to change splash image size in [Bundle.properties|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/Bundle.properties] *Frame icons* * [frame.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame.gif] * [frame_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame_dark.gif] * [frame32.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame32.gif] * [frame32_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame32_dark.gif] * [frame48.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame48.gif] * [frame48_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame48_dark.gif] *Updater* * [frame.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame.gif] * [frame32.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame32.gif] * [frame48.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame48.gif] * [updatersplash.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/updatersplash.gif]. Very old, contains reference to _Sun Public License_, which hasn't been used for years. However, the Updater Splash is shown so very briefly, so I don't think anyone notices. (reference to Sun Public License on this gif was removed in [PR-275|https://github.com/apache/incubator-netbeans/pull/275] committed on 29 Nov 2017) *Launcher* * Windows launcher (.exe embedded icon): [app.ico|https://github.com/apache/incubator-netbeans/blob/master/apisupport.harness/windows-launcher-src/app.ico] * Mac OS X launcher (embedded icon): [applicationIcon.icns|https://github.com/apache/incubator-netbeans/blob/master/apisupport.harness/release/etc/applicationIcon.icns] *Installer* * Windows installer launcher (.exe embedded icon): [icon.ico|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/native/launcher/windows/resources/icon.ico] * Mac OS X installer dock icon : [dockicon.icns|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/dockicon.icns] * Frame icon : [frame-icon.png|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/src/org/netbeans/installer/utils/helper/swing/frame-icon.png] h2. IDE Branding (overrides images in Platform) *About Dialog* * [about_nb.png|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/about_nb.png] * [about_dark_nb.png|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/about_dark_nb.png] *Splash* * [splash_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/splash_nb.gif] (*) * [splash_dark_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/splash_dark_nb.gif] (*) * It may be required to change splash image size in [Bundle_nb.properties|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties] *Frame icons* * [frame_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/frame_nb.gif] *
[jira] [Updated] (NETBEANS-146) Apache art-work rebranding
[ https://issues.apache.org/jira/browse/NETBEANS-146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] lbruun updated NETBEANS-146: Description: This lists what needs to be done for a complete re-branding of art-work, e.g. if logo changes. It complements NETBEANS-145. The purpose of the list is to document all places where a change will be required, if for example the logo changes. Those marked with (*) were updated in [PR275|https://github.com/apache/incubator-netbeans/pull/275] so that is will be possible to release under the ASF hospice. Consider this as a stop-gap measure. h2. Platform *About Dialog* * There's no specific image for the About Dialog: the splash image is used. *Splash* * [splash.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/splash.gif] (*) * [splash_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/splash_dark.gif] (*) * It may be required to change splash image size in [Bundle.properties|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/Bundle.properties] *Frame icons* * [frame.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame.gif] * [frame_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame_dark.gif] * [frame32.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame32.gif] * [frame32_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame32_dark.gif] * [frame48.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame48.gif] * [frame48_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame48_dark.gif] *Updater* * [frame.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame.gif] * [frame32.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame32.gif] * [frame48.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame48.gif] * [updatersplash.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/updatersplash.gif]. Very old, contains reference to _Sun Public License_, which hasn't been used for years. However, the Updater Splash is shown so very briefly, so I don't think anyone notices. (reference to Sun Public License on this gif was removed in [PR-275|[https://github.com/apache/incubator-netbeans/pull/275]] committed on 29 Nov 2017) *Launcher* * Windows launcher (.exe embedded icon): [app.ico|https://github.com/apache/incubator-netbeans/blob/master/apisupport.harness/windows-launcher-src/app.ico] * Mac OS X launcher (embedded icon): [applicationIcon.icns|https://github.com/apache/incubator-netbeans/blob/master/apisupport.harness/release/etc/applicationIcon.icns] *Installer* * Windows installer launcher (.exe embedded icon): [icon.ico|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/native/launcher/windows/resources/icon.ico] * Mac OS X installer dock icon : [dockicon.icns|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/dockicon.icns] * Frame icon : [frame-icon.png|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/src/org/netbeans/installer/utils/helper/swing/frame-icon.png] h2. IDE Branding (overrides images in Platform) *About Dialog* * [about_nb.png|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/about_nb.png] * [about_dark_nb.png|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/about_dark_nb.png] *Splash* * [splash_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/splash_nb.gif] (*) * [splash_dark_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/splash_dark_nb.gif] (*) * It may be required to change splash image size in [Bundle_nb.properties|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties] *Frame icons* * [frame_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/frame_nb.gif] *
[jira] [Updated] (NETBEANS-146) Apache art-work rebranding
[ https://issues.apache.org/jira/browse/NETBEANS-146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] lbruun updated NETBEANS-146: Description: This lists what needs to be done for a complete re-branding of art-work, e.g. if logo changes. It complements NETBEANS-145. The purpose of the list is to document all places where a change will be required, if for example the logo changes. Those marked with (*) were updated in [PR275|https://github.com/apache/incubator-netbeans/pull/275] so that is will be possible to release under the ASF hospice. Consider this as a stop-gap measure. h2. Platform *About Dialog* * There's no specific image for the About Dialog: the splash image is used. *Splash* * [splash.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/splash.gif] (*) * [splash_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/splash_dark.gif] (*) * It may be required to change splash image size in [Bundle.properties|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/Bundle.properties] *Frame icons* * [frame.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame.gif] * [frame_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame_dark.gif] * [frame32.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame32.gif] * [frame32_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame32_dark.gif] * [frame48.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame48.gif] * [frame48_dark.gif|https://github.com/apache/incubator-netbeans/blob/master/core.startup/src/org/netbeans/core/startup/frame48_dark.gif] *Updater* * [frame.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame.gif] * [frame32.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame32.gif] * [frame48.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/frame48.gif] * [updatersplash.gif|https://github.com/apache/incubator-netbeans/blob/master/autoupdate.services/libsrc/org/netbeans/updater/resources/updatersplash.gif]. Very old, contains reference to _Sun Public License_, which hasn't been used for years. However, the Updater Splash is shown so very briefly, so I don't think anyone notices. (reference to Sun Public License on this gif was removed in [PR-275|[https://github.com/apache/incubator-netbeans/pull/275],] committed on 29 Nov 2017) *Launcher* * Windows launcher (.exe embedded icon): [app.ico|https://github.com/apache/incubator-netbeans/blob/master/apisupport.harness/windows-launcher-src/app.ico] * Mac OS X launcher (embedded icon): [applicationIcon.icns|https://github.com/apache/incubator-netbeans/blob/master/apisupport.harness/release/etc/applicationIcon.icns] *Installer* * Windows installer launcher (.exe embedded icon): [icon.ico|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/native/launcher/windows/resources/icon.ico] * Mac OS X installer dock icon : [dockicon.icns|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/dockicon.icns] * Frame icon : [frame-icon.png|https://github.com/apache/incubator-netbeans/blob/master/nbi/engine/src/org/netbeans/installer/utils/helper/swing/frame-icon.png] h2. IDE Branding (overrides images in Platform) *About Dialog* * [about_nb.png|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/about_nb.png] * [about_dark_nb.png|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/about_dark_nb.png] *Splash* * [splash_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/splash_nb.gif] (*) * [splash_dark_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/splash_dark_nb.gif] (*) * It may be required to change splash image size in [Bundle_nb.properties|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties] *Frame icons* * [frame_nb.gif|https://github.com/apache/incubator-netbeans/blob/master/ide.branding/core.startup/src/org/netbeans/core/startup/frame_nb.gif] *
