[issue1648] divergent renames should be marked as conflicts during a merge

Bryan O'Sullivan mercurial-bugs at selenic.com
Tue May 5 00:35:10 CDT 2009


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

The handling of divergent renames could do with beefing up. Right now, neither
side of a divergent rename is marked as a conflict, so it's easy to miss the
warning printed during a merge and commit two copies of a file. If both were
marked as conflicts, the commit would be blocked until the user decided what to do.

----------
messages: 9260
nosy: bos
priority: bug
status: unread
title: divergent renames should be marked as conflicts during a merge
topic: merge

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



More information about the Mercurial-devel mailing list