[Monotone-commits-diffs] Revision 6823846e05751985cbb59d93af94f7a19f7a89d8

[monotone]

-----------------------------------------------------------------
Revision: 6823846e05751985cbb59d93af94f7a19f7a89d8
Ancestor: b96c334282bfec68e266931213d5c7c22f6ad6af
Author: address@hidden
Date: 2008-05-10T12:42:33
Branch: net.venge.monotone.mark-merge-existence

Modified files:
        cmd_merging.cc database_check.cc merge.cc revision.cc
        roster.cc roster_merge.cc roster_merge.hh

ChangeLog: 

 * More updates for existence mark merge.
 * Replace existance with existence everywhere.
 * Update tests to check for existence marks.
 * Update tests to set existence marks when building test cases.
 * Update roster unit tests for existence marks.  Lua tests not done yet.
 * Add a bunch of #warnings in places that still need work.
 * Replace insert_if_unborn() with mark_merge_existence() in roster_merge.cc
   * Implements most of the mark merge for existence stuff
   * Not complete as yet - function doesn't have db access it needs

txtWMn5pS3fvA.txt
Description: Diff [b96c334282bfec68e266931213d5c7c22f6ad6af] -> [6823846e05751985cbb59d93af94f7a19f7a89d8]