Changes 0 to 10 on this branch are displayed below, sorted in descending chronological order.

3451 days ago: Pass the database reference into roster_merge() and uncomment the code
revision info | browse files | diff
Author: willu@cse.unsw.edu.au
Changelog: * Pass the database reference into roster_merge() and uncomment the code
that looks for marks in the uncommon ancestors of the dead side.
Date: Sun, 11 May 2008 04:36:14 GMT
3451 days ago: More updates for existence mark merge.
revision info | browse files | diff
Author: willu@cse.unsw.edu.au
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
Date: Sat, 10 May 2008 12:42:33 GMT
3451 days ago: propagate from branch 'net.venge.monotone' (head aa52f9f8033136b315ee9257ee6ca0dd1a37d998)
revision info | browse files | diff, diff
Author: willu@cse.unsw.edu.au
Changelog: propagate from branch 'net.venge.monotone' (head aa52f9f8033136b315ee9257ee6ca0dd1a37d998)
to branch 'net.venge.monotone.mark-merge-existence' (head abeb35423c0de5a15774dbb2ef6a45536acf9bc8)
Date: Sat, 10 May 2008 12:37:16 GMT
3452 days ago: Clean up mark code (removing excess stuff I don't think I'll need any more).
revision info | browse files | diff
Author: willu@cse.unsw.edu.au
Changelog: Clean up mark code (removing excess stuff I don't think I'll need any more).
Add node_existance_conflicts.
Date: Sat, 10 May 2008 08:10:35 GMT
3452 days ago: Clean up after merge
revision info | browse files | diff
Author: willu@cse.unsw.edu.au
Changelog: Clean up after merge
Date: Sat, 10 May 2008 07:24:06 GMT
3452 days ago: propagate from branch 'net.venge.monotone' (head 25d76182286bccd52c355d6770414c62065c823b)
revision info | browse files | diff, diff
Author: willu@cse.unsw.edu.au
Changelog: propagate from branch 'net.venge.monotone' (head 25d76182286bccd52c355d6770414c62065c823b)
to branch 'net.venge.monotone.mark-merge-existence' (head 4ed353fd6e17980d7e579987f33594b85664c6c7)
Date: Sat, 10 May 2008 04:42:19 GMT
3604 days ago: propagate from branch 'net.venge.monotone' (head 4c0c4c4111dec5c850e3db5c984c889d1b4d4d95)
revision info | browse files | diff, diff
Author: willu@cse.unsw.edu.au
Changelog: propagate from branch 'net.venge.monotone' (head 4c0c4c4111dec5c850e3db5c984c889d1b4d4d95)
to branch 'net.venge.monotone.mark-merge-existence' (head b0d5ce2310eb08d1623c0cd70edffb4687f23f52)
Date: Sun, 09 Dec 2007 17:22:48 GMT
3629 days ago: Start introducing a merge mark for existence.
revision info | browse files | diff
Author: willu@cse.unsw.edu.au
Changelog: * Start introducing a merge mark for existence.
* roster.hh : Add an existence mark to struct marking_t.
* basic_io.hh : Introduce a new symbol for writing existence marks, "existence_mark".
* roster.cc : Add partial handling of the existence mark to roster generation.
Date: Thu, 15 Nov 2007 07:54:03 GMT
(no earlier changes) recent changes (no later changes)