On Wed, Apr 8, 2015 at 5:57 PM, Andy Bradford <amb-fos...@bradfords.org> wrote:
> Thus said Matt Welland on Wed, 08 Apr 2015 08:27:00 -0700: > > > What we are seeing is that forks happen due to simultaneous, partially > > overlapping, commits and that neither party involved in the two > > commits has any idea that a fork was committed. > > Perhaps this will help: > > http://www.fossil-scm.org/index.html/info/6b410f914ef5be53 > > Probably needs a review and possibly some testing, but it does seem to > work for me: > Thanks Andy, this looks like a serious move in the right direction (at least from my point of view). Here is what I see: # Sync with the "server" - yep, get WARNINGS, very nice! # 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 ****** Round-trips: 1 Artifacts sent: 4 received: 0 Sync done, sent: 618 received: 467 ip: # No messages on update # matt@xena:/tmp/testing$ fossil up Autosync: file:///home/matt/fossils/blah.fossil Round-trips: 1 Artifacts sent: 0 received: 0 Pull done, sent: 267 received: 412 ip: ------------------------------------------------------------------------------- checkout: 90420628697a12efe24747212c0ecdcb159706a3 2015-04-08 06:13:23 UTC leaf: open tags: trunk comment: Fooblah (user: matt) changes: None. Already up-to-date # No message on status # matt@xena:/tmp/testing$ fossil status repository: /tmp/testing/../blah.fossil local-root: /tmp/testing/ config-db: /home/matt/.fossil checkout: 90420628697a12efe24747212c0ecdcb159706a3 2015-04-08 06:13:23 UTC parent: 0b2ffb8eedfaaf7cb53a6461dd905411811b829c 2015-04-08 06:12:46 UTC leaf: open tags: trunk comment: Fooblah (user: matt) matt@xena:/tmp/testing$ Would it be possible to detect and warn on update, status and push? Thanks much for your effort on this. Matt -=- > > $ fossil set autosync > autosync (local) off > $ echo $RANDOM > file > $ fossil ci -m forked > New_Version: cd32dadcd1658f99ead152583122df658c9ce458 > $ fossil sync > Sync with http://amb@remote:8080/ > Round-trips: 1 Artifacts sent: 2 received: 0 > Server says: ****** WARNING: a fork has occurred ****** > Round-trips: 2 Artifacts sent: 2 received: 2 > Sync done, sent: 3135 received: 3102 ip: 192.168.50.39 > > Thanks, > > Andy > -- > TAI64 timestamp: 400000005525ceb8 > > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
