On Wed, May 21, 2008 at 11:54 PM, Bo Peng <[EMAIL PROTECTED]> wrote: >> It seems as if we could probably even merge the diff if different sub >> files were changes. Still seems unsatisfying, as most likely in both >> zip/ar files the base .lyx file would have been changed. > > Never tried this. This is impressive.
I meant for ar files. Not so impressive, as ar is not so common outside of *nix, and if we were going to design our own format we could make it more friendly to merging zips. there is a trade off between diff friendliness and random access though. As it turns out, in this simple example it worked with zip -0... sort of. Not something I would recommend though. ~/unzip/tmp$ patch < ../zip.diff can't find file to patch at input line 1 Perhaps you should have used the -p or --strip option? File to patch: shfiles3b.zip patching file shfiles3b.zip Hunk #2 FAILED at 98. Hunk #7 FAILED at 204. 2 out of 7 hunks FAILED -- saving rejects to file shfiles3b.zip.rej ~/unzip/tmp$ cd tmp/ ~/unzip/tmp/tmp$ unzip ../shfiles3b.zip Archive: ../shfiles3b.zip warning [../shfiles3b.zip]: 22 extra bytes at beginning or within zipfile (attempting to process anyway) file #1: bad zipfile offset (local header sig): 22 (attempting to re-compensate) extracting: benchmarkone.sh extracting: benchmarkset.sh extracting: benchmark.sh extracting: clean.sh extracting: cooldown.sh ... ~/unzip$ diff 1/ tmp/tmp/ diff 1/benchmarkset.sh tmp/tmp/benchmarkset.sh 7c7 < #sudo apt-get install wmctrl --- > ##sudo apt-get install wmctrl diff 1/cooldown.sh tmp/tmp/cooldown.sh 11c11 < top -n 1 | grep Cpu.s | grep -o '[^ ]*.id' #| sed s/[^0-9]//g --- > THIS IS BORKEN CHANGE top -n 1 | grep Cpu.s | grep -o '[^ ]*.id' #| sed > s/[^0-9]//g -- John C. McCabe-Dansted PhD Student University of Western Australia
