self conflict while saving the same file a lot
Bug #718924 reported by
Lucio Torre
This bug affects 3 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu One Client |
Fix Released
|
High
|
Facundo Batista | ||
ubuntuone-client (Ubuntu) |
Fix Released
|
High
|
Facundo Batista |
Bug Description
Binary package hint: ubuntuone-client
lucio@prometeo:
ubuntuone-client:
Installed: 1.5.3+r861~
Candidate: 1.5.3+r865~
Version table:
1.
500 http://
*** 1.5.3+r861~
100 /var/lib/
1.4.5-0ubuntu1 0
500 http://
1.
500 http://
created file a.txt, opened with vim, repeat edit then save a lot. get some conflcit files.
Related branches
lp:~facundo/ubuntuone-client/fix-conflict-case
- Facundo Batista (community): Approve
- John O'Brien (community): Approve
-
Diff: 369 lines (+137/-27)2 files modifiedtests/syncdaemon/test_action_queue.py (+108/-11)
ubuntuone/syncdaemon/action_queue.py (+29/-16)
Changed in ubuntuone-client (Ubuntu): | |
status: | New → Triaged |
importance: | Undecided → High |
assignee: | nobody → Facundo Batista (facundo) |
tags: | added: support |
Changed in ubuntuone-client: | |
status: | New → Triaged |
importance: | Undecided → High |
assignee: | nobody → Facundo Batista (facundo) |
summary: |
- self conflict while editing file with vim + self conflict while saving the same file a lot |
Changed in ubuntuone-client: | |
status: | Triaged → In Progress |
Changed in ubuntuone-client: | |
status: | In Progress → Fix Committed |
Changed in ubuntuone-client (Ubuntu): | |
milestone: | none → ubuntu-11.04-beta-1 |
tags: | added: u1-natty-beta |
Changed in ubuntuone-client: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
another user with conflicts and logs on debug