monotone

Issue 149: Invariant failure on wrong merge_into_dir

Reported by Thomas Keller, Mar 1, 2011

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

Considering the following rev graph:

  A0
 /  \
 A1 B0
 |   |
 A2 B1 

then

 $ mtn up -r h:B
 $ mtn merge_into_dir A B .

(where you probably meant merge_into_workspace)

Expected result:
----------------

Clear error message that there is a root conflict for this merge.


Actual results:
---------------

mtn: fatal: error: merge_conflict.cc:554: I(left_root != right_root)


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

0.99.1

Created: 5 years 2 months ago by Thomas Keller

Status: New

Labels:
Type:Incorrect Behavior
Priority:Medium

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status