conflict in file that isn't changed locally
Bug #645335 reported by
John Lenton
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | ||
|---|---|---|---|---|---|---|
| Ubuntu One Client | Status tracked in Trunk | |||||
| Stable-1-4 |
Fix Released
|
Critical
|
Lucio Torre | |||
| Trunk |
Fix Released
|
Critical
|
Lucio Torre | |||
| ubuntuone-client (Ubuntu) |
Fix Released
|
Medium
|
Ubuntu One Foundations+ team | |||
Bug Description
This might be the same as bug #508778, but I have logs :)
In a share I got .u1conflict files despite not changing those files. Nothing in the logs, so I removed the .u1conflicts, but then it happened again, so now I have logs :)
Attached.
Steps to reproduce:
Two clients, Client A & B running Maverick
1. Disconnect client B
2. On client A: $ > foo.txt
3. Sync client B (connect and disconnect)
4. On client A (while connected): $ echo hola > bar.txt ; mv bar.txt foo.txt
5. Connect client B
Related branches
lp://staging/~lucio.torre/ubuntuone-client/dont-reorder-deletes
- Guillermo Gonzalez: Approve
- John O'Brien (community): Approve
-
Diff: 53 lines (+8/-11)2 files modifiedtests/syncdaemon/test_sync.py (+7/-2)
ubuntuone/syncdaemon/sync.py (+1/-9)
lp://staging/~lucio.torre/ubuntuone-client/dont-reorder-deletes-stable
- Guillermo Gonzalez: Approve
- John O'Brien (community): Approve
-
Diff: 53 lines (+8/-11)2 files modifiedtests/syncdaemon/test_sync.py (+7/-2)
ubuntuone/syncdaemon/sync.py (+1/-9)
- dobey (community): Needs Resubmitting
-
Diff: 500 lines (+418/-11) (has conflicts)3 files modifiednautilus/ubuntuone-nautilus.c (+410/-0)
tests/syncdaemon/test_sync.py (+7/-2)
ubuntuone/syncdaemon/sync.py (+1/-9)
Revision history for this message
| John Lenton (chipaca) wrote | #1 |
Revision history for this message
| Lucio Torre (lucio.torre) wrote | #2 |
| Changed in ubuntuone-client: | |
| importance: | Undecided → Critical |
| status: | New → Triaged |
Revision history for this message
| Lucio Torre (lucio.torre) wrote | #3 |
| Changed in ubuntuone-client: | |
| status: | Triaged → In Progress |
| assignee: | nobody → Lucio Torre (lucio.torre) |
| description: | updated |
| Changed in ubuntuone-client (Ubuntu): | |
| status: | New → In Progress |
| milestone: | none → ubuntu-10.10 |
| assignee: | nobody → Ubuntu One Foundations+ team (ubuntuone-foundations+) |
| importance: | Undecided → Medium |
| tags: | added: chicharra chicharra-maverick desktop+ foundations+ u1-maverick |
| Changed in ubuntuone-client (Ubuntu): | |
| milestone: | ubuntu-10.10 → maverick-updates |
| Changed in ubuntuone-client (Ubuntu): | |
| status: | In Progress → Fix Released |
To post a comment you must log in.
aq_HANDLE_DELTA_OK leaves deletes for last, so a move over a file remotely creates a conflict.