On Wed, Apr 8, 2015 at 9:39 PM, Andy Bradford <amb-fos...@bradfords.org> wrote:
> 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? > One fork: fossil leaves (1) 2015-04-08 06:14:13 [0c744c0023] Borked (user: matt tags: trunk) (2) 2015-04-08 06:13:23 [9042062869] Fooblah (user: matt tags: trunk) > > Would it be possible to detect and warn on update, status and push? > > push should behave the same as sync already. > Ah, I see. The check and message only happens when there is data synced. > 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. > # Detection of multiple descendants only happens if the forked nodes are ahead in time # matt@xena:/tmp/testing$ fossil update Autosync: file:///home/matt/fossils/blah.fossil Round-trips: 1 Artifacts sent: 0 received: 0 Pull done, sent: 267 received: 410 ip: === 2015-04-08 === 06:14:13 [0c744c0023] Borked (user: matt tags: trunk) 06:13:23 [9042062869] Fooblah (user: matt tags: trunk) +++ no more data (2) +++ Multiple descendants # If you are on the tip of one of the legs of the fork - no warning # matt@xena:/tmp/testing$ fossil co 0c74 Blahfoo matt@xena:/tmp/testing$ fossil update Autosync: file:///home/matt/fossils/blah.fossil Round-trips: 1 Artifacts sent: 0 received: 0 Pull done, sent: 266 received: 412 ip: ------------------------------------------------------------------------------- checkout: 0c744c002354132468b38afa0e128cd76a024e5e 2015-04-08 06:14:13 UTC leaf: open tags: trunk comment: Borked (user: matt) changes: None. Already up-to-date This last one is the worst scenario, the user has a potentially serious problem and *no* hint that it exists. > 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 >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
