6 Commits

Author	SHA1	Message	Date
Benjamin Smedberg	a6c50c40f9	Bug 579178 part D - When unifying as sorted-matching, keep version A as the unified version, not the sorted version, r=ted	2010-08-05 10:11:39 -04:00
Benjamin Smedberg	b5d1f192d2	Unify should ensure that when a .manifest file is being compared, if the last line doesn't end with a newline, it should add one so that lines don't get munged together incorrectly. rs=ted	2010-06-29 19:19:23 -04:00
Ted Mielczarek	47d43bb381	bug 551941 - fix 'unify' to recognize 64-bit Mach-O files. r=bsmedberg ... --HG-- extra : rebase_source : 5b9ae5f47929f69d8c0627ed694b6c4354ca995e	2010-03-17 11:55:56 -04:00
Ted Mielczarek	6732e3ac46	bug 526668 - add option to 'unify' to allow files to match if their sorted contents match. r=bsmedberg	2009-11-05 09:04:49 -05:00
Ted Mielczarek	6f1bf78be2	bug 518641 - fix the "unify" script to properly handle Java .class files. r=bsmedberg ... Java .class files and Mach-O fat binaries use the same 4-byte magic number at the start of the file. 'unify' uses the magic number to detect Mach-O binaries, so it chokes on Java .class files. This change makes us use the same heuristic as file(1), which is to check the second 4 bytes in the file. Java class files put a version number there, and Mach-O fat binaries put the number of contained architectures there. Conveniently, Mach defines only 18 architectures, and Java's lowest shipping version number is 43, so there's no overlap in valid values. --HG-- extra : rebase_source : 84f5382bca6fa4bde721686f029514a41dfaf6b4	2009-09-29 08:31:50 -04:00
hg@mozilla.com	465265d0d4	Free the (distributed) Lizard! Automatic merge from CVS: Module mozilla: tag HG_REPO_INITIAL_IMPORT at 22 Mar 2007 10:30 PDT,	2007-03-22 10:30:00 -07:00