Sep 22, 2008 |
15 years 2 months | add 'interactive' resolution option for content conflicts. |
Sep 23, 2008 |
15 years 2 months | * tests/move_conflicting_unversioned/__driver__.lua: New test |
15 years 2 months | * Hum.. removed the bogus claim about speedups due to using empty(), |
15 years 2 months | monotone.Feeder.close(): fix close method so sync/pull work on linux |
Sep 26, 2008 |
15 years 2 months | * Upgraded to botan 1.7.9 |
Sep 27, 2008 |
15 years 2 months | * netxx/socket.cxx: fail cleanly if the connection timed out during
a read or write from / to the socket |
15 years 2 months | propagate from branch 'net.venge.monotone' (head
f68fcb495e4c2953634f15aa739c4f79e6a69b64) |
15 years 2 months | propagate from branch 'net.venge.monotone' (head
f68fcb495e4c2953634f15aa739c4f79e6a69b64) |
15 years 2 months | * Upgarded to botan 1.7.12. |
15 years 2 months | propagate from branch 'net.venge.monotone' (head
f68fcb495e4c2953634f15aa739c4f79e6a69b64) |
15 years 2 months | propagate from branch 'net.venge.monotone' (head
f68fcb495e4c2953634f15aa739c4f79e6a69b64) |
15 years 2 months | * netxx/socket.cxx (Socket::write, Socket::read): ETIMEDOUT not
defined in MinGW |
15 years 2 months | * netxx/socket.cxx: use #ifdef ETIMEDOUT instead of #if not
defined(WIN32) |
Sep 28, 2008 |
15 years 2 months | propagate from branch 'net.venge.monotone' (head
6dea8dc38e6f14cd9fbedee6b2ca2c9ff9e35d31) |
Sep 30, 2008 |
15 years 1 month | resolve conflicts: handle cases of no conflicts, propagate. |
Oct 1, 2008 |
15 years 1 month | * Moved the bundled botan, lua and pcre to a newly created Attic,
except |
15 years 1 month | * key_store.cc: added a condition on the botan version 1.7.15 or
newer |
15 years 1 month | * Cleaned up the includes to use <botan/*.h> everywhere,
instead of |
15 years 1 month | propagate from branch 'net.venge.monotone.botan' (head
e69d580489fe7404b11d5439076358be1c08890b) |
15 years 1 month | explicit merge of '19a04b0b679762d398dbca8542ea9b5e7c080062' |