On Mon, Jul 18, 2011 at 6:52 PM, Richard Hipp <d...@sqlite.org> wrote: > On Mon, Jul 18, 2011 at 6:41 PM, Joan Picanyol i Puig wrote: >> 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 > > 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 think what Joan is refering to is this, from the Fossil documentation: "Wiki pages can branch and merge just like check-ins, though as of this writing (2008-07-29) there is no mechanism in the user interface to support branching and merging. The current implementation of the wiki shows the version of the wiki page that has the most recent timestamp." So I think that manually fixing the timestamps will correct the problem. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
