From: <pj...@us...> - 2007-11-17 00:28:19
|
Revision: 3691 http://jython.svn.sourceforge.net/jython/?rev=3691&view=rev Author: pjenvey Date: 2007-11-16 16:28:15 -0800 (Fri, 16 Nov 2007) Log Message: ----------- Blocked revisions 3604,3689 via svnmerge ........ r3604 | cgroves | 2007-10-14 13:16:38 -0700 (Sun, 14 Oct 2007) | 1 line 2.2.1 updates ........ r3689 | pjenvey | 2007-11-16 16:05:57 -0800 (Fri, 16 Nov 2007) | 6 lines o fix PyFile truncate moving the file position if it was larger than the truncated size o avoid FileIO.readall attempting to allocate a negative sized ByteBuffer when the file position > file size fixes test_largefile ........ Property Changed: ---------------- branches/Release_2_2maint/ Property changes on: branches/Release_2_2maint ___________________________________________________________________ Name: svnmerge-blocked - /trunk:3438,3443,3450,3453,3456-3457,3459-3460,3462-3465,3470,3475-3478,3493-3495,3497,3509-3511,3514,3518,3521,3523,3535-3537,3539,3541,3546,3552,3554,3557-3558,3560,3569,3571,3576,3591,3630-3633,3639,3641-3642,3658,3662,3682-3683,3685 + /trunk:3438,3443,3450,3453,3456-3457,3459-3460,3462-3465,3470,3475-3478,3493-3495,3497,3509-3511,3514,3518,3521,3523,3535-3537,3539,3541,3546,3552,3554,3557-3558,3560,3569,3571,3576,3591,3604,3630-3633,3639,3641-3642,3658,3662,3682-3683,3685,3689 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |