[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Issue 209 - support drop/modified conflict (monotone)
From: |
code |
Subject: |
[Monotone-devel] Issue 209 - support drop/modified conflict (monotone) |
Date: |
Mon, 14 May 2012 02:37:52 +0200 |
Hello,
A new issue has been created:
209 - support drop/modified conflict
Project: monotone
Status: New
Reported by: Stephen Leake
Labels:
Type:Incorrect Behavior
Priority:Medium
Description:
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/
- [Monotone-devel] Issue 209 - support drop/modified conflict (monotone),
code <=