1. 21 Jul, 2007 3 commits
    • Jim Fulton's avatar
      154887a6
    • Jim Fulton's avatar
      Merged conflict-resolution bug fixes from trunk: · 03c08efa
      Jim Fulton authored
      r77078 | gary | 2007-06-25 16:39:45 -0400 (Mon, 25 Jun 2007) | 1 line
      r77010 | gary | 2007-06-24 13:19:18 -0400 (Sun, 24 Jun 2007) | 2 lines
      r76977 | gary | 2007-06-23 06:57:51 -0400 (Sat, 23 Jun 2007) | 1 line
      r76953 | gary | 2007-06-23 00:20:55 -0400 (Sat, 23 Jun 2007) | 1 line
      
      Document conflict resolution. bugfix the situation in which comparing
      persistent objects (for instance, as members in BTree set or keys of
      BTree) might cause data inconsistency during conflict resolution.
      support multidatabase references in conflict resolution.  make it
      possible to examine oid and (in some situations) database name of
      persistent object references so that I can add some code to
      zope.app.keyreference to support these objects (so BTree conflict
      resolution can happen at all when keyreferences are used).
      03c08efa
    • Jim Fulton's avatar
      merged spelling fixes from trunk r76952 · 3d523683
      Jim Fulton authored
      3d523683
  2. 25 Jun, 2007 6 commits
  3. 11 Jun, 2007 3 commits
  4. 10 Jun, 2007 10 commits
  5. 09 Jun, 2007 3 commits
  6. 08 Jun, 2007 2 commits
    • Christian Theune's avatar
      - updated the blob todo list · 435b3b75
      Christian Theune authored
       - some cleanups
       - re-introduced a way to ask for a rename() operation but fall back to copy
         if rename doesn't work
       - using the rename_or_copy for blobs where reasonable
       - fixed a test that was trying to test a failing consumeBlob but where the
         wrong exception was tested for
      435b3b75
    • Christian Theune's avatar
      - fixed typos · 763291b1
      Christian Theune authored
      763291b1
  7. 07 Jun, 2007 5 commits
  8. 06 Jun, 2007 7 commits
  9. 04 Jun, 2007 1 commit