I believe I was not clear: I am looking for a side-by-side diff for files in the 'normal' repository and their check-out counterparts, I am no interested in the wiki here. (I just mentioned the wiki as an example where Fossil presents information from files that are not yet checked in so the technology is there) -- Jos
_____ From: fossil-users-boun...@lists.fossil-scm.org [mailto:fossil-users-boun...@lists.fossil-scm.org] On Behalf Of Richard Hipp Sent: vrijdag 9 maart 2012 17:21 To: Fossil SCM user's discussion Subject: Re: [fossil-users] Side-by-side with checked out content On Fri, Mar 9, 2012 at 11:12 AM, Stephan Beal <sgb...@googlemail.com> wrote: On Fri, Mar 9, 2012 at 5:05 PM, Richard Hipp <d...@sqlite.org> wrote: It is theoretically possible to display a "graph" of changes to the wiki page, similar to the graphs that display on a timeline. And it is possible to have branches on a wiki page and to merge, etc. The underlying data format supports all these things, but I've never implemented them in the fossil binary, not having seen a need or demand for such features. Just out of curiosity: what happens on a wiki page edit collision? Last one wins or is the a "would fork" error? Last change wins, is how we do it at the moment. -- ----- stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- D. Richard Hipp d...@sqlite.org
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
