| Ticket UUID: | b081e09e28176eefdfd3a8a99d0d086205e890f0 | ||
| Title: | On conflict of binary files locally, fossil overwrites local changes | ||
| Status: | Open | Type: | Code_Defect |
| Severity: | Important | Priority: | |
| Subsystem: | Resolution: | ||
| Last Modified: | 2011-01-26 22:25:20 | ||
| Version Found In: | [6f42e76d80] | ||
| Description & Comments: | |||
|
In case of a modified binary file, and a later "fossil update" taking in changes in that file, fossil will overwrite the local file with that incoming.
It will report CONFLICT on that file, leaving "fossil undo" as the only option to get the local changes back. A user may loose changes in that situation, if he fails to see the CONFLICT message. I think that fossil should, like subversion, copy the file with local changes into another filename in the same directory, like "myfile.odt~local". | |||
View Ticket