[ARVADOS] updated: 23cc1183e500eb6fa22b611c1c6fc60de1aff9e7

[git at public.curoverse.com]

Summary of changes:
 services/keepstore/collision_test.go | 4 ++++
 1 file changed, 4 insertions(+)

  discards  96cf2bbec0b1178f94dd7b107245d328442b22ec (commit)
       via  23cc1183e500eb6fa22b611c1c6fc60de1aff9e7 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (96cf2bbec0b1178f94dd7b107245d328442b22ec)
            \
             N -- N -- N (23cc1183e500eb6fa22b611c1c6fc60de1aff9e7)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 23cc1183e500eb6fa22b611c1c6fc60de1aff9e7
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Sep 8 14:04:14 2015 -0400

    7121: Add collisionOrCorrupt->DiskHashError test cases where the mismatched data is in buf1.

diff --git a/services/keepstore/collision_test.go b/services/keepstore/collision_test.go
index e6cfd16..379dadd 100644
--- a/services/keepstore/collision_test.go
+++ b/services/keepstore/collision_test.go
@@ -39,6 +39,14 @@ func (s *CollisionSuite) TestCollisionOrCorrupt(c *check.C) {
 		check.Equals, DiskHashError)
 	c.Check(collisionOrCorrupt(fooMD5, []byte{}, nil, bytes.NewBufferString("")),
 		check.Equals, DiskHashError)
+	c.Check(collisionOrCorrupt(fooMD5, []byte{'f', 'O'}, nil, bytes.NewBufferString("o")),
+		check.Equals, DiskHashError)
+	c.Check(collisionOrCorrupt(fooMD5, []byte{'f', 'O', 'o'}, nil, nil),
+		check.Equals, DiskHashError)
+	c.Check(collisionOrCorrupt(fooMD5, []byte{'f', 'o'}, []byte{'O'}, nil),
+		check.Equals, DiskHashError)
+	c.Check(collisionOrCorrupt(fooMD5, []byte{'f', 'o'}, nil, bytes.NewBufferString("O")),
+		check.Equals, DiskHashError)
 
 	c.Check(collisionOrCorrupt(fooMD5, []byte{}, nil, iotest.TimeoutReader(iotest.OneByteReader(bytes.NewBufferString("foo")))),
 		check.Equals, iotest.ErrTimeout)

-----------------------------------------------------------------------


hooks/post-receive
--