#2911 closed defect (somebody else's problem)

magic-folder .conflict detection is incorrect

Reported by: meejah Owned by: daira
Priority: normal Milestone: undecided
Component: code-frontend-magic-folder Version: 1.12.1
Keywords: Cc:
Launchpad Bug:


It seems like the .conflict detection for magic-folder isn't always functioning as intended.

(Partially a placeholder for integration-tests relating to .conflict behavior; just want a ticket number for the branch).

Change History (3)

comment:1 Changed at 2018-05-01T18:24:29Z by meejah

After the 2909.backup-behavior.0 is merged, two problems with .conflict files remain:

  • Alice uploads a new file while Bob is offline; when Bob starts up, he records a conflict
  • There is no way to "resolve" a conflict (if we decide Alice is the "right content" then when Bob uploads a new version with the agreed-upon content, Alice will download and conclude it's a conflict)

comment:2 Changed at 2019-01-29T14:28:59Z by cypher

I've split the first issue above into a separate ticket (#2965), under the assumption that we will probably be addressing it separately.

comment:3 Changed at 2020-06-30T13:48:23Z by exarkun

  • Resolution set to somebody else's problem
  • Status changed from new to closed

magic-folder has been split out into a separate project - https://github.com/leastauthority/magic-folder

Note: See TracTickets for help on using tickets.