[issue819] no conflict reported when merging conflicting file types

[Bryan O'Sullivan]

New submission from Bryan O'Sullivan <bos at serpentine.com>:

The new test-merge-types test in crew checks what we do when merging conflicting
changes to a file's type.  On one branch, it becomes executable.  On the other,
it becomes a symlink.

It seems clear that this should result in a conflict and HGMERGE being called,
but instead the symlink always wins, no matter whether it's the left or right
parent.

----------
messages: 4259
nosy: bos
priority: bug
status: unread
title: no conflict reported when merging conflicting file types
topic: merge

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue819>
____________________________________________________