| Jun 3, 2012 |
|---|
| 12 years 11 months | Issue 209, support drop/modified conflict Status: Started |
| Jun 6, 2012 |
|---|
| 12 years 11 months | handle dropped/modified conflict due to deleted directory. |
| Jun 8, 2012 |
|---|
| 12 years 11 months | handle dropped then re-added file in dropped/modified conflict |
| Jun 9, 2012 |
|---|
| 12 years 11 months | add test of multiple merges with dropped_modified conflict |
| 12 years 11 months | resolve_dropped_modified_conflicts: fix minor bugs |
| 12 years 11 months | add resolve_conflicts_dropped_modified_upstream_vs_local |
| Jun 10, 2012 |
|---|
| 12 years 11 months | add pre-drop data to dropped_modified output. |
| Jun 19, 2012 |
|---|
| 12 years 10 months | Issue 209, support drop/modified conflict |
| 12 years 10 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 10 months | * src/merge_content.cc (resolve_merge_conflicts): require
--resolve_conflicts for all conflicts except dropped_modified. Still
not quite right; don't get proper report of conflict from merge
commands, just "no resolution specified" |
| Jun 21, 2012 |
|---|
| 12 years 10 months | * src/merge_conflict.cc (resolve_dropped_modified_conflicts): add
warning when resolution loses history |
| 12 years 10 months | propagate from branch 'net.venge.monotone.issue-209' (head
787ac8818c6d4fdadcc0f1257a849d46204a0250) |
| 12 years 10 months | require --resolve_conflicts even for mtn:resolve_conflicts, doc
attribute |
| 12 years 10 months | Issue 209, support drop/modified conflict |
| Jun 22, 2012 |
|---|
| 12 years 10 months | Issue 207, mtn revert inconsistent with/without inodeprints Owner: stephe |
| 12 years 10 months | Correct "--resolve_conflict" to
"--resolve-conflicts" |
| Jun 23, 2012 |
|---|
| 12 years 10 months | fix issue 207 (partial revert with/without inodeprints) and related
xfail test restricted_commit_with_inodeprints. |
| 12 years 10 months | Issue 207, mtn revert inconsistent with/without inodeprints Status: Fixed |
| 12 years 10 months | * test/func/netsync_key_hooks/__driver__.lua (SIGTERM): skip last
test on Windows |
| 12 years 10 months | Issue 206, mtn build breaks with Lua 5.2.0 Status: Fixed |
Atom feed