116 |
Version v = diff.applyTo(from); |
Version v = diff.applyTo(from); |
117 |
|
|
118 |
if(!id.equals(getVersionId(v, headerTo))) { |
if(!id.equals(getVersionId(v, headerTo))) { |
119 |
if(dbg) { |
if(true) { |
120 |
pa("============= DIFF ==============="); |
pa("============= DIFF ==============="); |
121 |
pa(new String(CopyUtil.readBytes(diffBlock.getInputStream()))); |
pa(new String(CopyUtil.readBytes(diffBlock.getInputStream()))); |
122 |
pa("=================================="); |
pa("=================================="); |
214 |
fmt.writeVersion(bos, v); |
fmt.writeVersion(bos, v); |
215 |
ms.addDatum(bos.toByteArray(), |
ms.addDatum(bos.toByteArray(), |
216 |
versionContentType, current); |
versionContentType, current); |
217 |
if(dbg) { |
if(true) { |
218 |
pa("============ CORRECT ============="); |
pa("============ CORRECT ============="); |
219 |
pa(new String(bos.toByteArray())); |
pa(new String(bos.toByteArray())); |
220 |
pa("=================================="); |
pa("=================================="); |