On Mon, Jul 18, 2011 at 6:41 PM, Joan Picanyol i Puig < [email protected]> wrote:
> 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 don't really understand your problem. I get the part about you having make some check-ins with far-in-the-future timestamps. But Fossil doesn't have a "latest wins merge strategy". So I'm not sure where that is causing a problem. When you try to reference a check-in by its branch name, Fossil actually chooses the check-in of that branch with the latest timestamp. So, if you have some check-ins which are far in the future, those check-ins might be selected when you use the branch name, even though they are not the last check-ins in sequence. Is that what you are having problems with? (That has nothing to do with merging, though, which is why I don't really understand the problem.) If the previous paragraph does describe your problem, then the solution is to simply use a version hash or a tag for a specific version instead of the branch name. Another solution is to use the "edit" feature of the web interface to manually change the timestamps of the far-in-the-future check-ins to something more reasonable. If the second paragraph does not describe your problem, please try and restate your problem in different words, so that I can understand it. Tnx. > > 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 > -- D. Richard Hipp [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
