Author: toad Date: 2008-12-17 14:28:35 +0000 (Wed, 17 Dec 2008) New Revision: 24433
Modified: branches/db4o/freenet/ branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java branches/db4o/freenet/src/freenet/support/BloomFilter.java branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java branches/db4o/freenet/test/freenet/support/io/MockInputStream.java Log: I really think these merge properties are wrong ... the lower number increases on every commit, isn't it supposed to be the range of commits we've merged? If so, it's forgetting it each time. And it's intentionally not documented by the svn book. Great. Well it might just be that nextgens' commit hook is broken - it's failing the commit every time I try to commit both properties and files at the same time ... Property changes on: branches/db4o/freenet ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/freenet:19964-24115 + /trunk/freenet:19964-24161 Property changes on: branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-24115 + /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-24161 Property changes on: branches/db4o/freenet/src/freenet/support/BloomFilter.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/freenet/src/freenet/support/BloomFilter.java:22002-24115 + /trunk/freenet/src/freenet/support/BloomFilter.java:22002-24161 Property changes on: branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-24115 + /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-24161 Property changes on: branches/db4o/freenet/test/freenet/support/io/MockInputStream.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-24115 + /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-24161 _______________________________________________ cvs mailing list [email protected] http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
