Thoughts on file ids

[Martin Geisler]

Francis Devereux <francis at devrx.org> writes:

> On 18 May 2011, at 13:13, Martin Pool wrote:
>
>> The kind of thing Robert is referring to here is cases like renaming
>> a subdirectory, and then later merging in a branch that originated
>> before that and changes or adds some files in that directory. Or
>> similarly, running log on one of the files in the directory or the
>> directory itself, or renaming a file and also changing it. Because
>> bzr handles directories as first-class objects, and gives them a
>> long-term id, it has in the past shown to handle these much better
>> than the alternatives.
>
> Thanks Martin. I did in fact run some renaming then merging tests a
> year or so ago and found that bzr behaved as I'd expect/want but git
> and hg didn't. I should dig out the tests and run them again to see
> how the most recent versions of git and hg do, and then blog about
> them (I had intended to do that when I originally ran them but life
> got in the way ;-)

We would be very happy to hear about these tests in the Mercurial
community -- to our knowledge, Mercurial merges renamed files and
directories correctly.

Stating otherwise without giving concrete commands to reproduce the
problem is not helpful for us.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://mercurial.aragost.com/kick-start/