Merge problems after moving directories in a branch

[Gustavo Narea]

On 06/04/10 11:25, Gustavo Narea wrote:
> On 06/04/10 11:18, Gustavo Narea wrote:
>> It's attached to this email
>
> Let me elaborate on the changes, just in case:
>
>    1. I cloned trunk at the revision it was when my colleague had the
>       merge problem.
>    2. I edited a file
>       (redesign-templates/marketing/contact/contact-team.html) and
>       committed the change. "redesign-templates" had been renamed to
>       "templates" in the "staging" branch.
>    3. I pulled from "staging" at the revision it was when my colleague
>       had the merge problem.
>    4. Then I merged and got the bad merge.
>
> Note I didn't even change the depth here. I did change the depth in
> the bad merge I reported initially.

I just found another consequence of these bad merges:

We had two files in trunk, "templates/forums/thread_list.html" and
"redesign-templates/forums/thread_list.html", and someone edited the
later. Then when I try to merge trunk into the branch where I renamed
"redesign-templates" and "templates", Mercurial tries to merge both
files into "templates/forums/thread_list.html".

It seems to be getting confused because of the "templates" directory: It
was renamed to "old-templates" but then another directory took its name
(the one which used to be called "redesign-templates").

Cheers.

-- 
Gustavo Narea.
Software Developer.
2degrees, Ltd. <http://www.2degreesnetwork.com/>.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20100406/93165bec/attachment.html>