From: SourceForge.net <no...@so...> - 2012-01-19 18:59:10
|
Merge Requests item #3449003, was opened at 2011-12-02 22:22 Message generated for change (Comment added) made by ezust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1235750&aid=3449003&group_id=588 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: for 4.5.x Status: Open Resolution: Remind Priority: 5 Private: No Submitted By: Alan Ezust (ezust) Assigned to: Matthieu Casanova (kpouer) Summary: remove 192m max heap size limit Initial Comment: Please merge rev# 20500 to remove the 192mb heap limit from jEdit. ---------------------------------------------------------------------- >Comment By: Alan Ezust (ezust) Date: 2012-01-19 10:59 Message: forget about 20501. 20673. Still todo: 20580, 20767. ---------------------------------------------------------------------- Comment By: Matthieu Casanova (kpouer) Date: 2012-01-19 01:21 Message: Oh yes I didn't saw those. But 20501 cause merging conflict, it is only about adding entry to the Changelog ? Some others are doc related, not about 192Mb ---------------------------------------------------------------------- Comment By: Alan Ezust (ezust) Date: 2012-01-19 00:16 Message: Now, the Accumulated revisions are: 20501,20580,20673,20767 ---------------------------------------------------------------------- Comment By: Alan Ezust (ezust) Date: 2012-01-19 00:15 Message: kpouer, you did not close this ticket, because you only merged 20500. There are many more rev#s that are included here. ---------------------------------------------------------------------- Comment By: Matthieu Casanova (kpouer) Date: 2012-01-18 23:53 Message: merged in rev 20856 ---------------------------------------------------------------------- Comment By: Alan Ezust (ezust) Date: 2012-01-12 15:50 Message: The build.xml parameter is removed from trunk in rev# 20767. the .idea files are for setting up a IDE environment and shouldn't be under revision control in the first place, IMHO. The package-files/os2 directory is unnecessary and removed from trunk. I suppose it should also be removed from 4.5.x, but that is a different issue, does it need to be connected with this merge request? ---------------------------------------------------------------------- Comment By: Kazutoshi Satoda (k_satoda) Date: 2011-12-21 09:34 Message: Tested the behavior of Windows installer with local merge on 4.5.x r20605. User-edited jedit.l4j.ini was left as expected. But this behavior prevents automatic removal of "-Xmx192M". Then I added a note in CHANGES.txt at r20673. Please add the revision to this merge request. Then the accumulated revisions are: r20500-r20501,20580,20673 I can't test for other environments. So I can't accept this request without reports on other major (Unix and Mac?) environments. Additionally, directory search of "192M" gave some questionable hits: 4.5.x/.idea/runConfigurations/jEdit.xml:6: <option name="VM_PARAMETERS" value="-Xmx192M -Djedit.home=$PROJECT_DIR$" /> 4.5.x/.idea/runConfigurations/jEdit__background_mode_.xml:6: <option name="VM_PARAMETERS" value="-Xmx192M -Djedit.home=$PROJECT_DIR$" /> 4.5.x/.idea/runConfigurations/jEdit__code_coverage_.xml:11: <option name="VM_PARAMETERS" value="-Xmx192M -Djedit.home=$PROJECT_DIR$" /> 4.5.x/build.xml:1106: vmoptions="-Xmx192M"> 4.5.x/package-files/os2/jedit.cmd:23: 'java -Xmx192M -classpath %classpath%;'jedit_dir'\jedit.jar org.gjt.sp.jedit.jEdit 'arguments 4.5.x/package-files/os2/jedit.cmd:25: 'java -Xmx192M -jar 'jedit_dir'\jedit.jar 'arguments Please look through them, and remove them or give explanation if they remain. ---------------------------------------------------------------------- Comment By: Alan Ezust (ezust) Date: 2011-12-08 12:17 Message: Removed offending comments in rev#20580 ---------------------------------------------------------------------- Comment By: Kazutoshi Satoda (k_satoda) Date: 2011-12-08 11:57 Message: I want this to be in 4.5.0 to avoid possible clobbering of user edited jedit.l4j.ini as addressed in a patch #2989244. http://sourceforge.net/support/tracker.php?aid=2989244 Then I looked through the diff, and found a nitpicking. http://jedit.svn.sourceforge.net/viewvc/jedit/jEdit/trunk/package-files/linux/jedit?r1=20500&r2=20499 I believe the remaining 2 lines starts with "# Set jvm heap ..." should be removed, as it was in OperatingSystem.java. Please fix it and add the revision in this request. memo: corresponding entry in CHANGES.txt was found in r20501. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1235750&aid=3449003&group_id=588 |