https://bz.mercurial-scm.org/show_bug.cgi?id=5522
Bug ID: 5522
Summary: merge reports invalid nothing to merge
Product: Mercurial
Version: 4.1.2
Hardware: PC
OS: Windows
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: alexraynepe...@gmail.com
CC: mercurial-devel@mercurial-scm.org
Created attachment 1954
--> https://bz.mercurial-scm.org/attachment.cgi?id=1954&action=edit
history with graph of point where merge fails
hallow!
i`ve try to merge into main-stream head <another> head, wich has an merged from
main-stream just before, and got report:
% hg merge --tool :merge --verbose 1099
прервано: nothing to merge
подсказка: use 'hg update' or check 'hg heads'
[команда вернула код 255 Wed Apr 05 11:21:42 2017]
graphicali it looks :
<main> <- <another>
| |
| < merge < main> <- <another2>
| |
|--------+--------------> < +main >
| --->< +main> |
| | |
if i try to merge with any other point from <another>, before last merge point
- all ok.
i've attaches hystori graph, and some report`s
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
