This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 02acbf5 [NETBEANS-3198] fallback to hard-coded build date in Options
import / export
new f5184a5 Merge pull request #1571 from neilcsmith-net/fix-netbeans-3198
02acbf5 is described below
commit 02acbf535621c1d4a17bcce17d6ca66816b41e8b
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Mon Oct 14 18:44:33 2019 +0100
[NETBEANS-3198] fallback to hard-coded build date in Options import / export
Hard-code the date (201910010000) when we switched from build number with
date to build number with git hash as quick fix for Options Import / Export
---
.../src/org/netbeans/modules/options/export/OptionsExportModel.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
b/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
index 95c0b2e..4ba81fa 100644
---
a/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
+++
b/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
@@ -226,7 +226,8 @@ public final class OptionsExportModel {
String time = (hours != null && minutes != null) ?
hours.concat(minutes) : "2359"; // NOI18N
return year.concat(month).concat(day).concat(time);
}
- return null;
+ // FIX NETBEANS-3198 : build number no longer contains a date
+ return "201910010000";
}
/**
---------------------------------------------------------------------
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
