Comment 2 for bug 449605

The problem is here: merge_directory generates this two events:

2009-10-12 00:47:49,726 - ubuntuone.SyncDaemon.EQ - DEBUG - push_event: SV_MOVED, args:(), kw:{'new_name': 'u1-test.txt~', 'new_share_id': '', 'share_id': '', 'new_parent_id': 'd3b01d84-82df-41db-9353-c5cf047e09b5', 'node_id': 'e70f7a96-861f-43d7-b504-180e66791d50'}

2009-10-12 00:47:49,733 - ubuntuone.SyncDaemon.EQ - DEBUG - push_event: SV_FILE_NEW, args:(), kw:{'parent_id': 'd3b01d84-82df-41db-9353-c5cf047e09b5', 'node_id': '2fb41532-2866-4aac-a252-d4a820cd7152', 'share_id': '', 'name': 'u1-test.txt'}

Which are ok, btw, because that's what really happened.

But then, the file is moved in the disk ('u1-test.txt' to 'u1-test.txt~'), and a new 'u1-test.txt' file is created, and then a FS_FILE_MOVE arrives (because of first change), and Sync confuses the origin of the movement as being the newly created node.