Hi, I've stumbled upon a situation in which fossil's "latest wins" merge strategy and a system's "far-in-the-future" clock have messed up my content & timeline. I do recall fossil's warning regarding out-of-synch clocks when synching, but thought that it would DTRT since the files being modified in that system where unrelated to the files being modified in the server against which it was synching.
I can live with the weird-looking timeline, but I'd like to get my content back. No amount of synching & updating will get the file's contents to be the same in the filesystem as they are through the embedded doc link which means that I can't reapply the patch (since on the filesystem the file is OK), but I can't see it's content either (since fossil hides it from me, I assume because it consideres it "merged"). 'fossil changes' does not show any change. I can pinpoint the check-in manifest that consists of *only* the diff I'd like to re-apply, and the artifacts representing the file before and after the change, but I still don't know how to fix this. Is this expected? Any ideas? tks -- pica _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
