[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Issue 149 - Invariant failure on wrong merge_into_dir (
From: |
code |
Subject: |
[Monotone-devel] Issue 149 - Invariant failure on wrong merge_into_dir (monotone) |
Date: |
Tue, 1 Mar 2011 10:02:05 +0100 (CET) |
Hello,
A new issue has been created and assigned
to you:
149 - Invariant failure on wrong merge_into_dir
Project: monotone
Status: New
Reported by: Thomas Keller
Labels:
Type:Incorrect Behavior
Priority:Medium
Description:
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
--
Issue: https://code.monotone.ca/p/monotone/issues/149/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-devel] Issue 149 - Invariant failure on wrong merge_into_dir (monotone),
code <=