monotone

monotone Mtn Change Log

Age Message
11 years 11 days * Pass the database reference into roster_merge() and uncomment the code

that looks for marks in the uncommon ancestors of the dead side.
Commit 9f20e15099d3610a1c2dd78ed1dc1f284c4a64ad, by willu@cse.unsw.edu.au
11 years 11 days * 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
Commit 6823846e05751985cbb59d93af94f7a19f7a89d8, by willu@cse.unsw.edu.au
11 years 11 days propagate from branch 'net.venge.monotone' (head aa52f9f8033136b315ee9257ee6ca0dd1a37d998)

to branch 'net.venge.monotone.mark-merge-existence' (head abeb35423c0de5a15774dbb2ef6a45536acf9bc8)
Commit b96c334282bfec68e266931213d5c7c22f6ad6af, by willu@cse.unsw.edu.au
11 years 12 days Clean up mark code (removing excess stuff I don't think I'll need any more).

Add node_existance_conflicts.
Commit abeb35423c0de5a15774dbb2ef6a45536acf9bc8, by willu@cse.unsw.edu.au
11 years 12 days Clean up after merge
Commit 250d0cd624cc1d2df00424ae792fdcea1d203a88, by willu@cse.unsw.edu.au
11 years 12 days propagate from branch 'net.venge.monotone' (head 25d76182286bccd52c355d6770414c62065c823b)

to branch 'net.venge.monotone.mark-merge-existence' (head 4ed353fd6e17980d7e579987f33594b85664c6c7)
Commit 4fb0c7c181fdc063f546f7735f1db23e79c2555b, by willu@cse.unsw.edu.au
11 years 5 months propagate from branch 'net.venge.monotone' (head 4c0c4c4111dec5c850e3db5c984c889d1b4d4d95)

to branch 'net.venge.monotone.mark-merge-existence' (head b0d5ce2310eb08d1623c0cd70edffb4687f23f52)
Commit 4ed353fd6e17980d7e579987f33594b85664c6c7, by willu@cse.unsw.edu.au
11 years 6 months * 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.
Commit b0d5ce2310eb08d1623c0cd70edffb4687f23f52, by willu@cse.unsw.edu.au

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status