resolve_doc needs to check what it's being asked to do and care that it doesn't mess up the database
Bug #1004004 reported by
John Lenton
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| U1DB |
Confirmed
|
Undecided
|
Unassigned | ||
Bug Description
resolve_doc needs to check what it's being asked to do and care that it doesn't mess up the database.
Currently you can arbitrarily bump revs (by resolving against tip) or create conflicts (by resolving against a previous revision -- this one might even be an honest mistake).
Revision history for this message
| John Lenton (chipaca) wrote | #1 |
| Changed in u1db: | |
| status: | New → Confirmed |
| assignee: | nobody → Eric Casteleijn (thisfred) |
| Changed in u1db: | |
| assignee: | Eric Casteleijn (thisfred) → nobody |
To post a comment you must log in.
AIUI it needs to check, for each revision passed in, whether it is currently in conflict, or part of the revision history, and resolve the first and ignore the second. I might have gotten that wrong.