Merge problems after moving directories in a branch

[Gustavo Narea]

Hi, Dennis.

On 01/04/10 12:04, Dennis Brakhane wrote:
> 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"?
>   

Yes, I also changed the depth (some directories are now less deep and
others are deeper).

However, when my colleague had the problem I mentioned earlier, the file
had the same depth.

> 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?
>   

For example, in my cleanup branch, I renamed "twod/templates" and
"twod/redesign-templates" to "old-templates/" and "templates",
respectively. Both directories have ~25 sub-directories each, and some
of them have 3 level deep files (e.g.,
"templates/marketing/snippets/file.html").

Then other people edited files in twod/templates/*/*/* and
twod/redesign-templates/*/*/* in trunk, after I cloned trunk and renamed
these directories... Which caused problems when I tried to merge trunk
into my cleanup branch.

> 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?

One of us is using Mac OS  X 10.5.8 and Mercurial 1.4.2
(easy_install'ed), and the one who had the merge problem today is using
Ubuntu Intrepid and Mercurial 1.3.1 (he installed it manually some time
ago). The rest of the team uses Ubuntu Karmic and Mercurial 1.3.1,
except for me -- I use Mercurial 1.5 from the PPA.

We maintain trunk and other branches on a Debian server with Mercurial
1.0.1.

Noone here uses Windows.

> Do you ore anyone else use export/import while working on the branch?
>   

No.

> Or did you use some kind of history editing like using mq? (For
> example, to join two
> seperate commits into one)
>   

One of the developers used "strip", but that was before I cloned trunk.

Cheers.

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