[BUG] win32-related bug in changeset.py::make_contents_change

[Alexander Belchenko]

I'm finally found bug that has a reason why merge not working properly 
on Win32. It is in changeset.py in method make_content_change in 
following construct:

if None not in (stat_a, stat_b) and stat.S_ISREG(stat_a.st_mode) and\
    stat.S_ISREG(stat_b.st_mode):
    if stat_a.st_ino == stat_b.st_ino and \
       stat_a.st_dev == stat_b.st_dev:
           return None

This construct always returns None on win32 when files was changed in 
both branches. I think it's because stat.st_ino & stat.st_dev has not 
sense on win32.

After disabling this construct on win32 merge works again.
Patch attached.

Alexander
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: changeset-win32.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20051015/acb6df40/attachment.diff