*** Before commit 551 jsonp> fossil commit -m "[d23bf4bbbb] Remove warnings" Autosync: http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi Bytes Cards Artifacts Deltas Send: 130 1 0 0 Received: 874 19 0 0 Total network traffic: 339 bytes sent, 771 bytes received fossil: would fork. "update" first or use -f or --force. 552 jsonp> *** After commit 552 jsonp> fossil commit -m "[d23bf4bbbb] Remove warnings" -f Autosync: http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi Bytes Cards Artifacts Deltas Send: 130 1 0 0 Received: 874 19 0 0 Total network traffic: 338 bytes sent, 771 bytes received New_Version: 1beab955418a942ab9953c4865109ff46cbbd691 Autosync: http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi Bytes Cards Artifacts Deltas Send: 2646 25 0 4 Received: 1058 23 0 0 Total network traffic: 1498 bytes sent, 864 bytes received **** warning: a fork has occurred ***** 556 jsonp> fossil merge b72e96832e UPDATE docs/qdj.lyx UPDATE docs/qdj.pdf 556 jsonp> fossil merge b72e96832e UPDATE docs/qdj.lyx UPDATE docs/qdj.pdf 557 jsonp> fossil status repository: /Users/jschimpf/Public/FOSSIL/jsonp.fossil local-root: /Users/jschimpf/Public/jsonp/ server-code: d3e7932b0b0f5e704264ba30adeae14978c08bc6 checkout: 1beab955418a942ab9953c4865109ff46cbbd691 2010-06-08 10:44:56 UTC parent: 6edbaf5fa8e4d061c2e04e7fd481e7663b090bd3 2010-06-07 10:45:57 UTC tags: trunk UPDATED_BY_MERGE docs/qdj.lyx UPDATED_BY_MERGE docs/qdj.pdf MERGED_WITH b72e96832e024f235696dcd6c5d0ddcc2cb38238 558 jsonp> fossil commit -m "After merging in changes" Autosync: http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi Bytes Cards Artifacts Deltas Send: 130 1 0 0 Received: 1058 23 0 0 Total network traffic: 340 bytes sent, 864 bytes received New_Version: 3d73c03edee33cdc2e1bd8a47de57b7a6b6d880a Autosync: http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi Bytes Cards Artifacts Deltas Send: 1737 26 0 1 Received: 1104 24 0 0 Total network traffic: 1101 bytes sent, 888 bytes received 559 jsonp>