Unable to resolve file conflict in UDF
Bug #782125 reported by
Eric Casteleijn
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu One Client |
New
|
Undecided
|
Ubuntu One Foundations+ team |
Bug Description
I have a file sort_mail.py in a UDF. Somehow a conflict arose for this file (which is strange, since I don't have any other machines syncing with U1 right now.)
When I rename the .u1conflict file to the original name, it is immediately renamed back to sort_mail.
When trying to resolve this, I tried to disable synchronization for the folder from Nautilus, which silently failed as well.
Attaching logs.
To post a comment you must log in.
This is the part of the log that is written when I rename the file back to the original and syncdaemon renames it back:
2011-05-13 12:40:46,162 - ubuntuone. SyncDaemon. Main - NOTE - ---- MARK (state: <State: 'QUEUE_MANAGER' (queues IDLE connection 'With User With Network')>; queue: 0; hash: 0) ---- SyncDaemon. StorageClient - DEBUG - Ping! rtt: 0.062 segs SyncDaemon. EQ - DEBUG - push_event: FS_FILE_CREATE, kwargs: {'path': '/home/ eric/bin/ sort_mail. py'} SyncDaemon. sync - DEBUG - T:SERVER:F 1647bfc0- 2c2e-4af8- 8a41-3212c3149f c9 ['5c084fb2- caa7-4020- a1bc-918611aad7 5b'::'9eb3bbc7- da1f-4461- aefa-f4562d53b9 c8'] ''bin/sort_ mail.py' ' | EVENT: FS_FILE_CREATE:{} with ARGS:(' /home/eric/ bin/sort_ mail.py' ,) SyncDaemon. sync - INFO - T:SERVER:F 1647bfc0- 2c2e-4af8- 8a41-3212c3149f c9 ['5c084fb2- caa7-4020- a1bc-918611aad7 5b'::'9eb3bbc7- da1f-4461- aefa-f4562d53b9 c8'] ''bin/sort_ mail.py' ' | Calling nothing (got FS_FILE_CREATE:{}) SyncDaemon. sync - DEBUG - T:SERVER:F 1647bfc0- 2c2e-4af8- 8a41-3212c3149f c9 ['5c084fb2- caa7-4020- a1bc-918611aad7 5b'::'9eb3bbc7- da1f-4461- aefa-f4562d53b9 c8'] ''bin/sort_ mail.py' ' | Called nothing SyncDaemon. EQ - DEBUG - push_event: FS_FILE_ CLOSE_WRITE, kwargs: {'path': '/home/ eric/bin/ sort_mail. py'} SyncDaemon. sync - DEBUG - T:SERVER:F 1647bfc0- 2c2e-4af8- 8a41-3212c3149f c9 ['5c084fb2- caa7-4020- a1bc-918611aad7 5b'::'9eb3bbc7- da1f-4461- aefa-f4562d53b9 c8'] ''bin/sort_ mail.py' ' | EVENT: FS_FILE_ CLOSE_WRITE: {} with ARGS:() SyncDaemon. sync - INFO - T:SERVER:F 1647bfc0- 2c2e-4af8- 8a41-3212c3149f c9 ['5c084fb2- caa7-4020- a1bc-918611aad7 5b'::'9eb3bbc7- da1f-4461- aefa-f4562d53b9 c8'] ''bin/sort_ mail.py' ' | Calling calculate_hash (got FS_FILE_ CLOSE_WRITE: {}) SyncDaemon. HQ - DEBUG - HashQueue: inserting path '/home/ eric/bin/ sort_mail. py' mdid 1647bfc0- 2c2e-4af8- 8a41-3212c3149f c9 SyncDaemon. HQ.hasher - DEBUG - Hasher: got file to hash: path '/home/ eric/bin/ sort_mail. py' mdid 1647bfc0- 2c2e-4af8- 8a41-3212c3149f c9 SyncDaemon. HQ.hasher - DEBUG - Hasher: path hash pushed: path='/ home/eric/ bin/sort_ mail.py' hash=sha1: ccf3f5ecd978669 6ef57ad56a36cfc 9a7300ea73 crc=270360920 size=3423 st_ino=12990046 st_size=3423 st_mtime= 1305228529. 1769295 SyncDaemon. sync - DEBUG - T:SERVER:F 1647bfc0- 2c2e-4af8- 8a41-3212c3149f c9 ['5c084fb2- caa7-4020- a1bc-918611aad7 5b'::'9eb3bbc7- da1f-4461- aefa-f4562d53b9 c8'] ''bin/sort_ mail.py' ' | Called calculate_hash SyncDaemon. EQ - DEBUG - push_event: HQ_HASH_NEW, kwargs: {'crc32': 270360920L, 'path': '/home/ eric/bin/ sort_mail. py', 'stat': posix.stat_ result( st_mode= 33261, st_ino=12990046L, st_dev=2053L, st_nlink=1, st_uid=1000, st_gid=1000, st_size=3423L, st_atime= 1305283223, st_mtime= 1305228529, st_ctime= 1305283288) , 'hash': 'sha1:ccf3f5ecd 9786696ef57ad56 a36cfc9a7300ea7 3', 'size':...
2011-05-13 12:40:53,474 - ubuntuone.
2011-05-13 12:41:28,156 - ubuntuone.
2011-05-13 12:41:28,158 - ubuntuone.
2011-05-13 12:41:28,160 - ubuntuone.
2011-05-13 12:41:28,162 - ubuntuone.
2011-05-13 12:41:28,163 - ubuntuone.
2011-05-13 12:41:28,165 - ubuntuone.
2011-05-13 12:41:28,167 - ubuntuone.
2011-05-13 12:41:28,167 - ubuntuone.
2011-05-13 12:41:28,168 - ubuntuone.
2011-05-13 12:41:28,168 - ubuntuone.
2011-05-13 12:41:28,170 - ubuntuone.
2011-05-13 12:41:28,171 - ubuntuone.