# # patch "ChangeLog" # from [c25cd6a2796b10d668fdeefa7ef4b4ae8df3e78a] # to [e759613dc3d7e4ecbd2066458825517a511b9acb] # # patch "sqlite/vdbeaux.c" # from [f07ea8a5c3f4b2bb7505f21753ea966d2f04d4d0] # to [278ac982f1f64ee14c49aac127d9ddc6ee30cac6] # --- ChangeLog +++ ChangeLog @@ -1,5 +1,11 @@ 2005-04-26 Nathaniel Smith + * sqlite/vdbeaux.c (MAX_6BYTE): Apply patch from + http://www.sqlite.org/cvstrac/chngview?cn=2445. It shouldn't + affect monotone's usage, but just in case. + +2005-04-26 Nathaniel Smith + * rcs_import.cc (struct cvs_key, process_branch): Fix indentation. (build_change_set): Handle the case where a file is "added dead". --- sqlite/vdbeaux.c +++ sqlite/vdbeaux.c @@ -1604,7 +1604,7 @@ } if( flags&MEM_Int ){ /* Figure out whether to use 1, 2, 4, 6 or 8 bytes. */ -# define MAX_6BYTE ((((i64)0x00010000)<<32)-1) +# define MAX_6BYTE ((((i64)0x00001000)<<32)-1) i64 i = pMem->i; u64 u = i<0 ? -i : i; if( u<=127 ) return 1;