| Jun 19, 2012 |
|---|
| 12 years 2 months | add attr mtn:resolve_conflict, use in
resolve_conflicts_dropped_modified_upstream_vs_local. Works, but
breaks other tests in a minor way. |
| 12 years 2 months | Issue 209, support drop/modified conflict |
| Jun 10, 2012 |
|---|
| 12 years 3 months | add pre-drop data to dropped_modified output. |
| Jun 9, 2012 |
|---|
| 12 years 3 months | add resolve_conflicts_dropped_modified_upstream_vs_local |
| 12 years 3 months | resolve_dropped_modified_conflicts: fix minor bugs |
| 12 years 3 months | add test of multiple merges with dropped_modified conflict |
| Jun 8, 2012 |
|---|
| 12 years 3 months | handle dropped then re-added file in dropped/modified conflict |
| Jun 6, 2012 |
|---|
| 12 years 3 months | handle dropped/modified conflict due to deleted directory. |
| Jun 3, 2012 |
|---|
| 12 years 3 months | Issue 209, support drop/modified conflict Status: Started |
| 12 years 3 months | * doc/monotone.texi: clean up conflict discussions. Fix an anchor.
Mention rename branch in rename command. |
| 12 years 3 months | finish dropped/modified; all tests pass, all documentation up to
date. |
| Jun 1, 2012 |
|---|
| 12 years 3 months | resolve_dropped_modified; progress, still fails tests |
| May 27, 2012 |
|---|
| 12 years 3 months | dropped_modified conflicts; better implementation. Still failing due
to history of drop. |
| May 25, 2012 |
|---|
| 12 years 3 months | dropped_modified conflicts; more tests, better implementation,
almost working |
| May 22, 2012 |
|---|
| 12 years 3 months | Issue 208, ml_gobject.c: conflicting types for 'g_value_get_variant' |
| May 16, 2012 |
|---|
| 12 years 3 months | add support for dropped/modified conflict; first test passes |
| May 14, 2012 |
|---|
| 12 years 4 months | Issue 209, support drop/modified conflict |
| 12 years 4 months | propagate from branch 'net.venge.monotone.lua-5.2' (head
aad657f04d0f21ece638434694aeabc833f37aa4) |
| 12 years 4 months | Issue 202, 'mtn conflicts resolve_first' error message w/o resolution Status: Fixed |
| May 13, 2012 |
|---|
| 12 years 4 months | Issue 208, ml_gobject.c: conflicting types for 'g_value_get_variant' |
Atom feed