monotone

monotone All Updates

AgeSort asc/descChange
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
Jun 19, 2012
10 years 1 month add attr mtn:resolve_conflict, use in resolve_conflicts_dropped_modified_upstream_vs_local. Works, but breaks other tests in a minor way.
Commit 6644cff8fa909e1b9d69554b60d473571f1ad135, by stephen_leake-2@stephe-leake.org
10 years 1 month Issue 209, support drop/modified conflict
Comment on issue 209, by Stephen Leake
Jun 10, 2012
10 years 2 months add pre-drop data to dropped_modified output.
Commit 2c0f9103d5356726f5ff0abf8d3546cc5d22b144, by stephen_leake-2@stephe-leake.org
Jun 9, 2012
10 years 2 months add resolve_conflicts_dropped_modified_upstream_vs_local
Commit 6c4dfef59abaf41783e202dc79fada774d2332a6, by stephen_leake-2@stephe-leake.org
10 years 2 months resolve_dropped_modified_conflicts: fix minor bugs
Commit 54a1b63d943a9d445b3fdf33d80e5f9b66d659b1, by stephen_leake-2@stephe-leake.org
10 years 2 months add test of multiple merges with dropped_modified conflict
Commit c67426e491a95c2cb764d5315442d81843bf82e8, by stephen_leake-2@stephe-leake.org
Jun 8, 2012
10 years 2 months handle dropped then re-added file in dropped/modified conflict
Commit e46f9aa2c96785da56a6ae6a13197ee7f3ad7b8c, by stephen_leake-2@stephe-leake.org
Jun 6, 2012
10 years 2 months handle dropped/modified conflict due to deleted directory.
Commit f33065689b915304ecbc095df537751e12ebd3dd, by stephen_leake-2@stephe-leake.org
Jun 3, 2012
10 years 2 months Issue 209, support drop/modified conflict
Status: Started
Comment on issue 209, by Stephen Leake
10 years 2 months * doc/monotone.texi: clean up conflict discussions. Fix an anchor. Mention rename branch in rename command.
Commit 3b2a2ec027f659b2a11f02f794a8edd4884c4be5, by stephen_leake-2@stephe-leake.org
10 years 2 months finish dropped/modified; all tests pass, all documentation up to date.
Commit 329d1fe78cc665997e872034520b09d0309f98eb, by stephen_leake-2@stephe-leake.org
Jun 1, 2012
10 years 2 months resolve_dropped_modified; progress, still fails tests
Commit 544ac7c8203751d61f6ccc016d6b0a28cb1e7596, by stephen_leake-2@stephe-leake.org
May 27, 2012
10 years 2 months dropped_modified conflicts; better implementation. Still failing due to history of drop.
Commit be008714e09af86a72e27ae7044cb85b9e689909, by stephen_leake-2@stephe-leake.org
May 25, 2012
10 years 2 months dropped_modified conflicts; more tests, better implementation, almost working
Commit 898bc317e5a1db50c15daa6038a4cecc6d4e8230, by stephen_leake-2@stephe-leake.org
May 22, 2012
10 years 2 months Issue 208, ml_gobject.c: conflicting types for 'g_value_get_variant'
Comment on issue 208, by J Doe
May 16, 2012
10 years 2 months add support for dropped/modified conflict; first test passes
Commit bf033095aaea2a9278e5f869efb4dc3116ff5a12, by stephen_leake-2@stephe-leake.org
May 14, 2012
10 years 2 months Issue 209, support drop/modified conflict
Creation of issue 209, by Stephen Leake
10 years 2 months propagate from branch 'net.venge.monotone.lua-5.2' (head aad657f04d0f21ece638434694aeabc833f37aa4)
Commit 53e02eaa302bc05e96a18e3882b0e9843b53cf9a, by stephen_leake-2@stephe-leake.org
10 years 2 months Issue 202, 'mtn conflicts resolve_first' error message w/o resolution
Status: Fixed
Comment on issue 202, by Stephen Leake
May 13, 2012
10 years 2 months Issue 208, ml_gobject.c: conflicting types for 'g_value_get_variant'
Comment on issue 208, by Thomas Moschny

All Updates

Filter by type
Commits
Issues and Comments
Reviews and Patches

Subscribe to this timeline
RSS Atom feed

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