[Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone)

[code]

Hello,

The following issue has been updated:

209 - support drop/modified conflict
Project: monotone
Status: Started
Reported by: Stephen Leake
URL: https://code.monotone.ca/p/monotone/issues/209/
Labels:
 Type:Incorrect Behavior
 Priority:Medium

Comments (last first):

# By Stephen Leake, Jun 21, 2012:

mtn:resolve_conflicts is finished in branch nvm.issue-209.file_attribute, rev 
fc8be5f8894e0e0160f475b0cf463180649926db.

# By Stephen Leake, Jun 19, 2012:

Changing dropped/modified from warning to conflict complicates an important use 
case; upstream modified, local dropped. For example, upstream uses a particular 
build file that local does not need, so local wants to drop it and ignore all 
future changes.

One way to support that use case, and similar ones, is to provide a 
'mtn:resolve_conflict' attribute, to specify the 'drop' resolution for this 
case. Work on this is being done in branch nvm.issue-209.file_attribute.

That attribute requires an extra branch in some cases; for example, where 
upstream is in mtn, but does not want to add the attributes, the local 
maintainer needs another branch that is a copy of upstream but adds the 
attributes. To resolve that issue, we could try to store attributes for deleted 
nodes in a new revision level structure. However, it is difficult to uniquely 
identify the file involved in a way that can be synced, in the face of renames 
upstream.

# By Stephen Leake, Jun  3, 2012:

fixed in branch nvm.issue-209; dropped/modified conflicts are fully supported.

 Status: Started

# By Stephen Leake, May 14, 2012:

Steps to reproduce the problem:
-------------------------------

1. create two heads, one with file_a modified, one with file_a dropped
2. merge

Expected result:
----------------
merge reports a drop/modified conflict

Actual results:
---------------
warning about modifications being lost due to drop

Output of `mtn version --full`:
-------------------------------
1.0



--
Issue: https://code.monotone.ca/p/monotone/issues/209/