| Jun 24, 2012 |
|---|
| 12 years 2 months | Issue 65, When the left and right descendants contain the same change, merge into ancestor Status: Invalid |
| 12 years 2 months | Issue 198, Wish: propagate w/o commit |
| 12 years 2 months | Issue 198, Wish: propagate w/o commit |
| 12 years 2 months | Issue 198, Wish: propagate w/o commit |
| Jun 23, 2012 |
|---|
| 12 years 2 months | Issue 193, Log and status of unknown file matching ignore list does not generate error Status: Fixed |
| 12 years 2 months | * test/func/status_of_ignored: New directory, for issue 193 |
| 12 years 2 months | Issue 201, "pull" and "db check" have different opinion on whether branch certs are needed |
| 12 years 2 months | * test/func/pull_branch_vs_db_check: New directory, for issue 201. |
| 12 years 2 months | Issue 198, Wish: propagate w/o commit |
| 12 years 2 months | Issue 206, mtn build breaks with Lua 5.2.0 Status: Fixed |
| 12 years 2 months | * test/func/netsync_key_hooks/__driver__.lua (SIGTERM): skip last
test on Windows |
| 12 years 2 months | Issue 207, mtn revert inconsistent with/without inodeprints Status: Fixed |
| 12 years 2 months | fix issue 207 (partial revert with/without inodeprints) and related
xfail test restricted_commit_with_inodeprints. |
| Jun 22, 2012 |
|---|
| 12 years 2 months | Correct "--resolve_conflict" to
"--resolve-conflicts" |
| 12 years 2 months | Issue 207, mtn revert inconsistent with/without inodeprints Owner: stephe |
| Jun 21, 2012 |
|---|
| 12 years 2 months | Issue 209, support drop/modified conflict |
| 12 years 2 months | require --resolve_conflicts even for mtn:resolve_conflicts, doc
attribute |
| 12 years 2 months | propagate from branch 'net.venge.monotone.issue-209' (head
787ac8818c6d4fdadcc0f1257a849d46204a0250) |
| 12 years 2 months | * src/merge_conflict.cc (resolve_dropped_modified_conflicts): add
warning when resolution loses history |
| Jun 19, 2012 |
|---|
| 12 years 2 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" |
Atom feed