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.
f6aadc744b6f was an incorrect merge (corrected in e34eec42a441). 20eb46fb5aa2 deleted a file which 78e10891a932 modified: db/src/org/netbeans/modules/db/explorer/infos/RootNodeInfo.java Yet this automated merge proceeded without interruption, keeping the modified version. NB-Core-Build should rather have reported a merge conflict requiring manual resolution. I think setting the env var HGMERGE is obsolete - this probably dates to Hg 1.0 or even 0.9.5.
AFAIK the proper way to enforce an internal merge is: --config ui.merge=internal:merge Unfortunately this behaves the same way, picking the default action ("[c]hanged") and proceeding.
--config ui.interactive=1 lets you force the merge command to treat input as interactive, so if you provide none it should fail if it needs to ask any questions. So for this merge I get: main$ hg up -C 939577c1ab37 ... main$ hg --config ui.merge=internal:merge --config ui.interactive=1 merge 10622c2f0070 < /dev/null || echo 'merge failed' local changed db/src/org/netbeans/modules/db/explorer/infos/RootNodeInfo.java which remote deleted use (c)hanged version or (d)elete? abort: response expected merge failed So I suggest nbbuild/hudson/{core-main,round-robin-push,team-private-repo,team-repo} be amended to 1. Not set HGMERGE. 2. When performing merges, run something like: hg --config ui.merge=internal:merge --config ui.interactive=1 merge < /dev/null || exit BTW core-main in "sync" mode does no status checking on the merge command at all! This needs to be fixed.
Problem appeared also in the opposite direction: merge from main -> core-main left RootNodeInfo.java there.
f61e8a311f3f was again incorrect and should not have proceeded.
(made worse by: http://mercurial.selenic.com/bts/issue1740)
#c6f2ed2c26e5 in be-main
Integrated into 'main-golden', will be available in build *200907200201* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/6af3a3083867 User: Michal Zlamal <mzlamal@netbeans.org> Log: #156634 Let merge fail if any input is requred
You are still using HGMERGE=merge export HGMERGE which I think can be deleted.
Integrated into 'main-golden', will be available in build *200908210201* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/36772e7aa64e User: Michal Zlamal <mzlamal@netbeans.org> Log: #156634 Remove redundant MGMERGE variable