divergent file rename

[Diego Oliveira]

Hello crew,
I'm having some strange behavior doing the merge of different file reame
based in the
same revision. I'm looking to understand what should be the correct behavior
of the
merge scenario.


A (file.txt) --- B (file.txt-> file2.txt) ---+- D (?)
 \                                                   /
  +---- @C (file.txt-> file3.txt) ------+


The actual behavior let the two files in the work dir for the commit D, but
i think the
correct should be to keep the file3.txt merged with the changes in
file2.txt.


-- 
Att.
Diego de Oliveira
System Architect
diego at diegooliveira.com
www.diegooliveira.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial-devel/attachments/20090506/714beaf3/attachment.htm