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.
Product Version = NetBeans IDE Dev (Build 201306162301) Operating System = Windows 7 version 6.1 running on x86 Java; VM; Vendor = 1.7.0_15 Runtime = Java HotSpot(TM) Client VM 23.7-b01 I was Pulling changes from a Mercurial repository. When done, IDE prompted about merging heads created by the pull. I agreed then the IDE prompted me with the Merge message. I provided it and committed. It showed an error afterwards. Looks to be related to the length of the command attempted. From the logs (attached): Mercurial command "hg commit" could not be executed as too many arguments (502) where passed Please perform this operation from the command line.
Created attachment 136038 [details] IDE log
had to do it from TortoiseHg.
Can you paste the content of the mercurial Output window? (Window -> Output and find the repository's tab)
Did you commit the merge normally with the Commit dialog? It is strange because the IDE should recognize this and should not attempt to commit with any file parameters after a merge because it is not allowed by mercurial after a merge.
fix: http://hg.netbeans.org/core-main/rev/85e28f7b6574
Integrated into 'main-golden', will be available in build *201306212301* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/85e28f7b6574 User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #231535 - Mercurial Merge Failed after prompted by IDE the after-merge commit failure should be handled even after committing a reduced file list