Merge problems after moving directories in a branch

[Dennis Brakhane]

On Thu, Apr 1, 2010 at 11:41 AM, Gustavo Narea
<gustavonarea at 2degreesnetwork.com> wrote:
> "old-directory/document.html" is the document he edited today, but early
> this week I renamed "old-directory" to "new-directory".

Are you renaming a directory or also changing the depth?
For example, do you rename "a/b/c/d" to "a/e" or "f/g"?

I still couldn't trigger the bug when I did renamings like this, but it might
help to see where the problem lies. Could you provide the exact renames?
Are there more mercurial versions involved than 1.5 and 1.3.1?
Is everyone using the same operating system, or is this a mixed
windows/Unix environment?

Greetings,
  Dennis