Thus said Matt Welland on Wed, 08 Apr 2015 21:07:00 -0700: > matt@xena:/tmp/testing$ fossil sync > Sync with file:///home/matt/fossils/blah.fossil > Round-trips: 1 Artifacts sent: 4 received: 0 > Server says: ****** WARNING: a fork has occurred ****** > Server says: ****** WARNING: a fork has occurred ******
I assume you actually had 2 forks in the content that you were syncing? > Would it be possible to detect and warn on update, status and push? push should behave the same as sync already. I'm not sure about update and status at the moment and just what that might involve. status will already show multiple children if you are on a node that has forked, however, if you are at the tip of a fork, that is a bit trickier to handle (I think). Also, update will complain if you are on a node that has forked and try to update without specifying which of the descendants you want to use. They may require more thought... Thanks, Andy -- TAI64 timestamp: 40000000552602a5 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
