Rev 3880: Merge the last hack3 change. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/hack3

John Arbash Meinel john at arbash-meinel.com
Fri Mar 20 17:51:21 GMT 2009


At http://bzr.arbash-meinel.com/branches/bzr/brisbane/hack3

------------------------------------------------------------
revno: 3880
revision-id: john at arbash-meinel.com-20090320174318-eh4vpxyffj851gl6
parent: john at arbash-meinel.com-20090320170430-fvgnzc1amp7rmd11
parent: john at arbash-meinel.com-20090319232956-gwkog4jygz9h0l8u
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hack3
timestamp: Fri 2009-03-20 12:43:18 -0500
message:
  Merge the last hack3 change.
modified:
  bzrlib/diff-delta.c            diffdelta.c-20090226042143-l9wzxynyuxnb5hus-1
    ------------------------------------------------------------
    revno: 3877.1.3
    revision-id: john at arbash-meinel.com-20090319232956-gwkog4jygz9h0l8u
    parent: john at arbash-meinel.com-20090319225110-hfslu08ridcsc5xi
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: hack3
    timestamp: Thu 2009-03-19 18:29:56 -0500
    message:
      Get the > sign the right way around.
      We want to expand hmask if it is too small, not shrink it if it
      is too big.
    modified:
      bzrlib/diff-delta.c            diffdelta.c-20090226042143-l9wzxynyuxnb5hus-1
-------------- next part --------------
=== modified file 'bzrlib/diff-delta.c'
--- a/bzrlib/diff-delta.c	2009-03-19 23:30:50 +0000
+++ b/bzrlib/diff-delta.c	2009-03-20 17:43:18 +0000
@@ -447,6 +447,7 @@
     free(hash_count);
     if (old) {
         old->last_src = src;
+        assert(old->hash_mask <= hmask);
     }
     index = pack_delta_index(hash, hsize, total_num_entries, old);
     free(hash);



More information about the bazaar-commits mailing list