monotone All Updates - A distributed version control system

AgeSort asc/desc	Change
Prev 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 Next
Sep 22, 2008
15 years 2 months	add 'interactive' resolution option for content conflicts.
Commit 9d40e0fc291b77a793b08070d5a018863bb2d153, by stephen_leake-2@stephe-leake.org
Sep 23, 2008
15 years 2 months	* tests/move_conflicting_unversioned/__driver__.lua: New test
Commit 6c5f277ee80220df961db23a3f3d91854f837872, by stephen_leake-2@stephe-leake.org
15 years 2 months	* Hum.. removed the bogus claim about speedups due to using empty(),
Commit 6341444c06293469f66f1c431063282004c5be9d, by Markus Wanner
15 years 2 months	monotone.Feeder.close(): fix close method so sync/pull work on linux
Commit fb53b9693096741d611e59b218d9e4786693c7cf, by zbigg@zbigg.org
Sep 26, 2008
15 years 2 months	* Upgraded to botan 1.7.9
Commit d5ccbf4fd54da38aa75a01278cc085fcd5bd2330, by Markus Wanner
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
Commit f68fcb495e4c2953634f15aa739c4f79e6a69b64, by Thomas Keller
15 years 2 months	propagate from branch 'net.venge.monotone' (head f68fcb495e4c2953634f15aa739c4f79e6a69b64)
Commit 11a1a75e10b99724f112dffd30f85b1949eea82b, by Markus Wanner
15 years 2 months	propagate from branch 'net.venge.monotone' (head f68fcb495e4c2953634f15aa739c4f79e6a69b64)
Commit a6f1aa522da94524d718fb2c43fca6bf5e01eda9, by Markus Wanner
15 years 2 months	* Upgarded to botan 1.7.12.
Commit 9e982bd0b2189d9979270a1f3764a85f727c0721, by Markus Wanner
15 years 2 months	propagate from branch 'net.venge.monotone' (head f68fcb495e4c2953634f15aa739c4f79e6a69b64)
Commit e69d580489fe7404b11d5439076358be1c08890b, by Markus Wanner
15 years 2 months	propagate from branch 'net.venge.monotone' (head f68fcb495e4c2953634f15aa739c4f79e6a69b64)
Commit 78f1fbb5c667f6b4b6ecf60b774b53d0a3a75102, by Markus Wanner
15 years 2 months	* netxx/socket.cxx (Socket::write, Socket::read): ETIMEDOUT not defined in MinGW
Commit 43ac4fb8b3bdb0fd4aa943690eac0b86854a7af3, by stephen_leake-2@stephe-leake.org
15 years 2 months	* netxx/socket.cxx: use #ifdef ETIMEDOUT instead of #if not defined(WIN32)
Commit 6dea8dc38e6f14cd9fbedee6b2ca2c9ff9e35d31, by stephen_leake-2@stephe-leake.org
Sep 28, 2008
15 years 2 months	propagate from branch 'net.venge.monotone' (head 6dea8dc38e6f14cd9fbedee6b2ca2c9ff9e35d31)
Commit 47c0d8167bdfb6afeaad49508a7cab90d235c09c, by stephen_leake-2@stephe-leake.org
Sep 30, 2008
15 years 1 month	resolve conflicts: handle cases of no conflicts, propagate.
Commit 403b93667354008c411e2b175af5835fc238caa6, by stephen_leake-2@stephe-leake.org
Oct 1, 2008
15 years 1 month	* Moved the bundled botan, lua and pcre to a newly created Attic, except
Commit 77546fef5be6d7be065939f63e1eeab71f60402b, by Markus Wanner
15 years 1 month	* key_store.cc: added a condition on the botan version 1.7.15 or newer
Commit e3e6279b5f2b90da7fa4f4353b78c092e016d5dd, by Markus Wanner
15 years 1 month	* Cleaned up the includes to use <botan/*.h> everywhere, instead of
Commit 19a04b0b679762d398dbca8542ea9b5e7c080062, by Markus Wanner
15 years 1 month	propagate from branch 'net.venge.monotone.botan' (head e69d580489fe7404b11d5439076358be1c08890b)
Commit 626c25d49e718c0d8b93f5503ebcafd3f5e17d47, by Markus Wanner
15 years 1 month	explicit merge of '19a04b0b679762d398dbca8542ea9b5e7c080062'
Commit af2eef4adf4328edd1345b7382f5507b9ab7f66b, by zbigg@zbigg.org