[issue455] Mismerge involving two concurrently renamed directories

tailgunner mercurial-bugs at selenic.com
Mon Dec 18 12:46:59 CST 2006

New submission from tailgunner <tailgunner at smtp.ru>:

Steps to reproduce:
 make 2 clones of mainline Mercurial repository
 rename hgext to hg-ext in one of them
 change some files under hg-ext
 in other clone, create a new directory at the top and move _everything_ in there
then merge two clones 

Attached is small tar archive which contains 2 test cases which cause mismerge.

assignedto: mpm
files: tc.tar
messages: 2547
nosy: mpm, tailgunner
priority: urgent
status: unread
title: Mismerge involving two concurrently renamed directories

Mercurial issue tracker <mercurial-bugs at selenic.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tc.tar
Type: application/x-tar
Size: 10240 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial-devel/attachments/20061218/b5311822/tc.tar

More information about the Mercurial-devel mailing list